Merge pull request #826 from kugel-/doxygen-fixes2