fixing up the version in changelog
Merge branch 'master' into testing

* master:
  fixing up the version in changelog