Update from dev to fix doc errors

Merged Vasudevan, Rama K requested to merge dev into master

Created by: CompPhysChris

Merge request reports