Merge "Random documentation tweaks"