Merge remote-tracking branch 'powerpc/next'