Fix version number. (We really need automated testing on this.)
Merge branch 'dev'