Merge pull request #905 from sanger/next_release

Release-5.25.0