Merge branch 'master' into v2.1

diff --cc src/lj_gc.c
Simple merge

diff --cc src/lj_trace.c
index 466d9cd2a36638ad8cba6725fb269d32b3718d4d,c70fc247ecc5527b6bf3436b2451ef55126e2f3e..2b8d931ff7593fbde56f354c8f4f5ca7f11973d5
--- 1/src/lj_trace.c
--- 2/src/lj_trace.c
+++ b/src/lj_trace.c
@@@ -777,11 -776,9 +777,11 @@@ int LJ_FASTCALL lj_trace_exit(jit_Stat
    pc = exd.pc;
    cf = cframe_raw(L->cframe);
    setcframe_pc(cf, pc);
 -  if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
 +  if (LJ_HASPROFILE && (G(L)->hookmask & HOOK_PROFILE)) {
 +    /* Just exit to interpreter. */
 +  } else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
      if (!(G(L)->hookmask & HOOK_GC))
-       lj_gc_check(L);  /* Exited because of GC: drive GC forward. */
+       lj_gc_step(L);  /* Exited because of GC: drive GC forward. */
    } else {
      trace_hotside(J, pc);
    }