Merge branch 'release/2.5.0' into develop
Including forgotten archive files.
Version bump to 2.5.1, including archives.
Merge branch 'release/2.5.1'