Merge branch '2.4-release' into 2.5-release
Fix typo and broken link
Merge pull request #1457 from carlossg/patch-1

Fix typo and broken link
Merge branch '2.5-release' into 2.5-testing
Merge branch '2.5-testing' into 2.6-dev