Merge branch 'master' into mac

Conflicts:
	.cproject
	Debug/makefile
	Debug/sources.mk
	Debug/subdir.mk
	Release/makefile
	asan/makefile
	asan/sources.mk
	asan/subdir.mk
	tsan/makefile
	tsan/sources.mk
	tsan/subdir.mk