Small additions.
Merge branch 'master' into develop
Version bump.
Merge branch 'develop'