bb97060 Update #2195 patch backport (it was revised upstream)

Authored and Committed by adamwill 2 years ago
    Update #2195 patch backport (it was revised upstream)
    
        
file modified
+6 -13
file modified
+4 -1