Fix a few Doxygen warnings.
Merge pull request #1497 from iglesias/develop

Fix a few Doxygen warnings.