Merged pull request (doxygen)