Merge the original development branch due to breakage caused by the
MTTCG merge.

Conflicts:
	cpu-exec.c
	translate-common.c
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>