Merge "Fix doxygen errors" into devel/master