Merge branch 'master' into v2.1

diff --cc src/msvcbuild.bat
index cd25beee1f98bfa57c9051f268893c49cfd88d79,0ac654097a5e6df4e3ca2853af156db1a41a598d..91cfd065091370d94a209ba9558098dc443785ed
--- 1/src/msvcbuild.bat
--- 2/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@@ -93,7 -72,7 +94,8 @@@ buildvm -m folddef -o lj_folddef.h lj_o
  @shift\r
  @set BUILDTYPE=debug\r
  @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS%\r
+ @set LJDYNBUILD=/MDd /DLUA_BUILD_AS_DLL\r
 +@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no\r
  :NODEBUG\r
  @set LJLINK=%LJLINK% /%BUILDTYPE%\r
  @if "%1"=="amalg" goto :AMALGDLL\r