Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios.for-upstream-201808...