Backport 3130

Document fix for 1.7.1