Ahodges/doc/doc839

@sarina , @srpearce , @njdup, apologies for the short turnaround, but I'd like to merge this midday tomorrow if possible