Merge remote-tracking branch 'origin/master' into 537

Conflicts:
	Contrast/Contrast.csproj