Merge branch 'master' into develop
Bumped up version.
Merge branch 'develop'