Merge "Minor documentation cleanup"