MANUAL Merge branch 'master' into sliceup

Conflicts:
	mongoctl/mongoctl.py