Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Release notes for 2.5.3