Bump version number
Merge branch 'origin/master'