Merge remote-tracking branch 'kwolf/for-anthony' into staging

Conflicts:
	block/vmdk.c

diff --cc Makefile.objs
Simple merge

diff --cc block.c
Simple merge

diff --cc block/vmdk.c
Simple merge

diff --cc configure
Simple merge

diff --cc qemu-options.hx
Simple merge

diff --cc trace-events
Simple merge