Bumping version number to match main repo.
Merge branch 'master' into dev