8bfa859 Backport patch from upstream

Authored and Committed by Richard Hughes 3 years ago
    Backport patch from upstream
    
        
file added
+66
file modified
+8 -2