Doxygen fixes
Merge branch '1.6'