Merge pull request #5246 from fgaz/docs-patch