Merge latest changes from the upstream (ipxe:master)

Include changes from the upstream repo to keep this fork close to the original.