[prep-release-3.1.0] Update CHANGELOG with last minute changes
Merge branch 'prep-release-3.1.0' into develop-ascraeus

* prep-release-3.1.0:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes