Change version for release.
Merge branch 'dev'