Merge remote-tracking branch 'spaetz/master'