Fixed doxygen obsolete stuff
Merge branch 'master' into stable