Merge branch 'sun4u_qemu_2.11'