Bump version
Merge branch 'develop' into stable