Merge branch 'merge' into powerpc-next