Correct the Doxyfile
Merge branch 'doxygen_upgrade'