Fix Garrett Cooper's name.

Sorry, Garrett!
Merge branch 'release-1.7.x'