Merge branch 'master' into v2.1

diff --cc src/lib_ffi.c
Simple merge

diff --cc src/lj_cparse.c
Simple merge

diff --cc src/lj_ctype.c
Simple merge

diff --cc src/lj_ctype.h
Simple merge