Use consistent versioning.
Merge pull request #1456 from rjackson/use_consistent_versioning

Use consistent versioning.