Updated Doxygen about object types
Merge remote-tracking branch 'upstream/master'