Really update version numbers this time
Merge branch 'develop'