Fix build with SANITIZE_THREAD
Allow '-' char in mod name
Fix warnings
Merge remote-tracking branch 'upstream/master' into envlock

Conflicts:
	src/lua/CMakeLists.txt