Docs and one small improvement for issue #25304, by Vincent Michel. (Merge 3.5->3.6.)