Fix a ton of doc formatting issues.
Merge branch '4.1'