Merge remote-tracking branch 'geoff/for-powerpc' into next