Merge pull request #23653 from thaJeztah/20160616-docs-cherry-picks

20160616 docs cherry picks