Merge branch 'master' into v2.1

diff --cc src/lj_asm_arm.h
index 348cd79f8a0a4a984e12ac6b398c6a138f928e98,8869af3278e1a94d0c0993bdffab83e361cffd40..bd5fbeb183b2b2be5dd83e772d5dbf1b7c0134f2
--- 1/src/lj_asm_arm.h
--- 2/src/lj_asm_arm.h
+++ b/src/lj_asm_arm.h
@@@ -2093,7 -2045,8 +2100,8 @@@ static void asm_stack_restore(ASMState 
      }
      checkmclim(as);
    }
 -  lua_assert(map + nent == flinks);
+   emit_addptr(as, RID_BASE, bias);
 +  lj_assertA(map + nent == flinks, "inconsistent frames in snapshot");
  }
  
  /* -- GC handling --------------------------------------------------------- */