Some field tending
Merge remote-tracking branch 'origin/master'

Conflicts:
	maps/scenarios/Gallic Wars.xml