fixed missing colon
Merge branch 'master' into pep8

Conflicts:
	interfaces/web.py

merge fix from master