fixed up broken merge in CloneConnector
Merge branch 'master' into toms_devel

Conflicts:
	src/connectors.py