the stream wasn't needed...
Merge remote-tracking branch 'khuff/doxy_fixes' into develop