Fix build of v3.1.6
Update Changelog.
Bump to 3.1.7