fixed issue with quiting at network problem
Merge remote-tracking branch 'upstream/master'

Conflicts:
	auto.py