Clean up the documetation.
Merge remote-tracking branch 'upstream/master'