Merge branch 'doxygen-fixes'