Merge pull request #925 from techee/doxygen_warning