Merge branch 'master' into v2.1

diff --cc src/jit/bcsave.lua
index 5117f714ac7e01ceba72fe68243b8c299af7e9a2,70b92aafefb8393464a5fd0f812d9867f75824ef..079ce19e9b4c705d284fc0b0196acf8df1c39979
--- 1/src/jit/bcsave.lua
--- 2/src/jit/bcsave.lua
+++ b/src/jit/bcsave.lua
@@@ -237,9 -237,9 +237,9 @@@ typedef struct 
    hdr.eendian = isbe and 2 or 1
    hdr.eversion = 1
    hdr.type = f16(1)
 -  hdr.machine = f16(({ x86=3, x64=62, arm=40, ppc=20, ppcspe=20, mips=8, mipsel=8 })[ctx.arch])
 +  hdr.machine = f16(({ x86=3, x64=62, arm=40, arm64=183, ppc=20, mips=8, mipsel=8 })[ctx.arch])
    if ctx.arch == "mips" or ctx.arch == "mipsel" then
-     hdr.flags = 0x50001006
+     hdr.flags = f32(0x50001006)
    end
    hdr.version = f32(1)
    hdr.shofs = fofs(ffi.offsetof(o, "sect"))