Bump version
Merge branch 'hotfix/version'