Merge tag 'v2.5.0'

2.5.0
Fix side-effects of PR #237 - see #242
Merge branch 'fabien-fix/issue-242'
Bump version
Merge branch 'release/2.5.1' into production