Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/tasks/build_geographic_areas.rake