proper development version number
Merge branch 'devel'