Merge branch 'master' into StringFormatting

Conflicts:
	common/debug.cpp