Downmerge from "develop" branch
Merge branch 'master' into develop
Update version strings to 1.7-SNAPSHOT