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