Merge branch 'release/1.7.0' into develop
don't skip anything coming out of repo for upgrade
version bump
Merge branch 'release/1.7.1'