Merge branch 'develop' into geo

Conflicts:
	buildout_common.cfg