Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-6.0-pull-request' into...