Merge branch 'master' into v2.1

diff --cc doc/install.html
Simple merge

diff --cc doc/luajit.html
Simple merge

diff --cc src/lib_io.c
Simple merge

diff --cc src/lib_os.c
Simple merge

diff --cc src/lj_arch.h
Simple merge