change version defaults to sensible set
Merge branch 'refs/heads/develop'