Merge remote-tracking branch 'origin/test-branch'

Conflicts:
	NewHeightsMapL4D2.vmf