Merge branch 'develop'
Increment version number.