371cda4 Backport fix for #1630943 from upstream master

Authored and Committed by adamwill 5 years ago
    Backport fix for #1630943 from upstream master
    
        
file modified
+7 -1