clean up.
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/__init__.py
clean up.