Update the version numbers.
Merge branch 'release/v1.7' into develop