Cherry pick some old documentation changes.

Gets master fully up to date with develop.