Merge commit 'origin/master' into kvm-ppc-3.8