Merge branch 'master' into develop
Merge branch 'master' into develop

* master:
  Update version number.
  Empty strings token values should not be replaced by the token.
  Update version number
  Bugfix on getting a token value equals to an empty string
Add '-', '_' and '|' to the matching regex.