Bump version properly..
Merge branch 'hotfix/1.5.5'