Merge master into 4.3.4

Conflicts:
	HackFixes.cpp