Fixing doc style.
Merging upstream changes.