Updated version and changelog.
Merge branch 'dev'