Merge pull request #468 from peternewman/e1.37-2

Tidy some Doxygen
Fix some Doxygen bugs