Prep a confused merge
Merge remote-tracking branch 'origin/dox' into dox

Update local rep with some updates made elsewhere.
Working on dox