Fix encoding
Merge branch 'master' into tornado

Conflicts:
	wdb/ui.py