Merge remote branch 'gcl/powerpc/merge' into merge