Doc comment fix.
Merge branch '3.7'