Remove non breaking spaces interfere with encoding
Merge branch 'develop'

* develop:
  Remove non breaking spaces interfere with encoding