Merge remote-tracking branch 'ppc-port/ppc-squashed'