Update the version number.
Merge branch 'develop'