Merge branch 'FindDoxygen-compat' into release-3.9