Merge remote-tracking branch 'remotes/vivier/tags/pull-m68k-20150629' into staging