Update CHANGELOG entry
Bumping version to 1.2.11
Merge branch 'release-1.2.11' into develop

* release-1.2.11:
  Bumping version to 1.2.11
  Update CHANGELOG entry