Replaced a deprecated function.
Version bump
Merge branch 'develop'