Bugfix on getting a token value equals to an empty string

Using empty strings was interpreted as an undefined token.
Update version number
Empty strings token values should not be replaced by the token.
Update version number.
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