Merge branch 'master' into v2.1

diff --cc src/lj_lex.c
index ad3f1306adeca4c4c50a89c2e03c2ff8d0ae3752,e1dc3cdfde2654720ea1e957a40c2570f6a9c5c0..8409cd78a7136224947e72e60c8f76e0011bcb0f
--- 1/src/lj_lex.c
--- 2/src/lj_lex.c
+++ b/src/lj_lex.c
@@@ -375,6 -378,7 +375,7 @@@ int lj_lex_setup(lua_State *L, LexStat
    ls->vtop = 0;
    ls->bcstack = NULL;
    ls->sizebcstack = 0;
 -  ls->token = 0;
++  ls->tok = 0;
    ls->lookahead = TK_eof;  /* No look-ahead token. */
    ls->linenumber = 1;
    ls->lastline = 1;