Merge branch 'master' into v2.1

diff --cc src/jit/dump.lua
index 4800a6b8eced2894dad0bcee2641b03a39fdbe08,22568ac724983257c0fc244660086623e8778a95..abd722871180d3349dbb4ec1e937588720c0a948
--- 1/src/jit/dump.lua
--- 2/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@@ -276,8 -270,9 +276,8 @@@ local litname = 
    ["CONV  "] = setmetatable({}, { __index = function(t, mode)
      local s = irtype[band(mode, 31)]
      s = irtype[band(shr(mode, 5), 31)].."."..s
 -    if band(mode, 0x400) ~= 0 then s = s.." trunc"
 -    elseif band(mode, 0x800) ~= 0 then s = s.." sext" end
 +    if band(mode, 0x800) ~= 0 then s = s.." sext" end
-     local c = shr(mode, 14)
+     local c = shr(mode, 12)
      if c == 2 then s = s.." index" elseif c == 3 then s = s.." check" end
      t[mode] = s
      return s