minor
Merge remote-tracking branch 'origin/master'

Conflicts:
	MarketServerHost/app.config