#311 gracefully handle connection exceptions
Merge branch 'master' into m2t

Conflicts:
	migrationtools/m2t.py