Merge branch 'fix_qemu_size_argument' of https://github.com/berendt/packer into berendt-fix_qemu_size_argument

Conflicts:
	website/source/docs/builders/qemu.html.markdown