Merge branch 'master' into v2.1

diff --cc src/lj_api.c
Simple merge

diff --cc src/lj_debug.c
Simple merge

diff --cc src/lj_debug.h
index cc7e93d2745f335644ec2c007117ee6db50517a0,43fb9c195484e21d768201cd6c4c91166ccee7bc..a8be19e8d2277780554ba1ac07fd913775b272ae
--- 1/src/lj_debug.h
--- 2/src/lj_debug.h
+++ b/src/lj_debug.h
@@@ -29,12 -29,13 +29,13 @@@ typedef struct lj_Debug 
  LJ_FUNC cTValue *lj_debug_frame(lua_State *L, int level, int *size);
  LJ_FUNC BCLine LJ_FASTCALL lj_debug_line(GCproto *pt, BCPos pc);
  LJ_FUNC const char *lj_debug_uvname(GCproto *pt, uint32_t idx);
- LJ_FUNC const char *lj_debug_uvnamev(cTValue *o, uint32_t idx, TValue **tvp);
+ LJ_FUNC const char *lj_debug_uvnamev(cTValue *o, uint32_t idx, TValue **tvp,
+                                    GCobj **op);
  LJ_FUNC const char *lj_debug_slotname(GCproto *pt, const BCIns *pc,
                                      BCReg slot, const char **name);
 -LJ_FUNC const char *lj_debug_funcname(lua_State *L, TValue *frame,
 +LJ_FUNC const char *lj_debug_funcname(lua_State *L, cTValue *frame,
                                      const char **name);
 -LJ_FUNC void lj_debug_shortname(char *out, GCstr *str);
 +LJ_FUNC void lj_debug_shortname(char *out, GCstr *str, BCLine line);
  LJ_FUNC void lj_debug_addloc(lua_State *L, const char *msg,
                             cTValue *frame, cTValue *nextframe);
  LJ_FUNC void lj_debug_pushloc(lua_State *L, GCproto *pt, BCPos pc);