Merge ../powerpc-merge