bump version for develop
Merge branch 'master' into develop