708d9f3 Pull in upstream fixes

Authored and Committed by jgrulich 4 years ago
    Pull in upstream fixes
    
        
file modified
+6 -1