Merge branch 'master' into v2.1

diff --cc src/lj_record.c
Simple merge

diff --cc src/lj_state.c
Simple merge

diff --cc src/lj_trace.c
index f311d54b878dd25567eef72dce9597418c090b2f,25e610b58992a92bb2ed6fdc74eff3509d58d82f..fee78e2ed6dfd1fb4864b3593e9a7470bc6883c0
--- 1/src/lj_trace.c
--- 2/src/lj_trace.c
+++ b/src/lj_trace.c
@@@ -613,9 -524,10 +613,10 @@@ static int trace_abort(jit_State *J
      J->cur.link = 0;
      J->cur.linktype = LJ_TRLINK_NONE;
      lj_vmevent_send(L, TRACE,
-       TValue *frame;
 -      cTValue *bot = tvref(L->stack);
++      cTValue *bot = tvref(L->stack)+LJ_FR2;
+       cTValue *frame;
        const BCIns *pc;
-       GCfunc *fn;
+       BCPos pos = 0;
        setstrV(L, L->top++, lj_str_newlit(L, "abort"));
        setintV(L->top++, traceno);
        /* Find original Lua function call to generate a better error message. */