Version bump
Merge branch 'hotfix-25'