Updated version number.
Merge branch 'dev'