Fixed versioning for our release numbers.
Merge branch 'dev'