Add support for unicode version strings
Merge branch 'master' into release

* master:
  Add support for unicode version strings