Merge pull request #3054 from plntyk/fix_qemu