Fix string types

And remove merging artifact
Merge branch '0.9-maintenance'

Conflicts:
	tests/test_debug.py