Merge pull request #4619 from annando/missing-doxygen