Merge release/2.5.1 onto develop

The versions used in the .rst files need to be updated to 2.6.0-SNAPSHOT