Merge branch 'master' into v2.1

diff --cc src/Makefile
Simple merge

diff --cc src/lib_ffi.c
Simple merge

diff --cc src/lj_gc.c
Simple merge

diff --cc src/lj_mcode.c
Simple merge

diff --cc src/lj_parse.c
Simple merge