Merge branch 'stable-2.5' into stable-2.6

* stable-2.5:
  Release notes for 2.5.3