Merge branch 'combobuild'

Conflicts:
	connection.pyc