Minor doctor tweaks#1

Open

jjaffeux wants to merge 5 commits intopfaffman:masterfrom

jjaffeux:minor-doctor-tweaks

Commits on Jul 7, 2018

Commits on Jul 10, 2018

Updates as requested for PR
pfaffman
committed

Commits on Jul 11, 2018