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

Hopefully fix the final Doxygen warnings
Merge pull request #471 from peternewman/e1.37-2

Check Doxygen as part of Travis