2013-10-03
Merge remote-tracking branch 'origin/master'

Conflicts:
	scope_connections.py