Updated change log
Bumped version number
Merge branch 'release/6.0.0' into develop

* release/6.0.0:
  Updated change log Bumped version number