Merge commit 'origin/master' into kvm-ppc-auto-next