Downmerge from "develop" branch
Update the release profile for Android Maven Plugin
Merge branch 'master' into develop
Update version strings to 1.7-SNAPSHOT