Bump version
Merge branch 'master' into refactor-common-functions