Documentation fixes.
Merge pull request #2334 from nawroth/master

Documentation fixes