Merge branch 'master' into v2.1

diff --cc src/lj_opt_fold.c
Simple merge

diff --cc src/lj_opt_sink.c
Simple merge

diff --cc src/lj_strscan.c
Simple merge