indent error
Merge branch 'master' into py3convfix

Conflicts:
	setup.py