Update version number
Merge branch 'master' into guile-2