this fixes doxygen errors for me
Merge branch 'gidden-doxy'