Development version

Previously, the version number in the main development line did not
indicate that it was a development version.  This has now been changed
in preparation for release.
Merge branch 'dev-version'