minor
Merge remote-tracking branch 'origin/master'

Conflicts:
	COG.iws
	server/strategies38729/D4631001
	server/strategies38729/D4631003
	server/strategies38729/default