Merge remote-tracking branch 'origin/next' into kvm-ppc-next