Redoing FILTERDOC fix for 1.8.3 #1565
Merge pull request #1568 from robander/feature/1565

Redoing FILTERDOC fix for 1.8.3 #1565