Merge branch 'master' into v2.1

diff --cc src/lib_package.c
Simple merge

diff --cc src/lj_clib.c
Simple merge

diff --cc src/ljamalg.c
Simple merge

diff --cc src/luaconf.h
Simple merge