Fix whitespace
Merge branch 'master' into steamclient-beta