Issue #868 - Slashes in Taxonomy text inputs
Merge branch 'pr/870'

Conflicts:
	readme.txt