Version bump
Merge branch 'hotfix/2.5.8'