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