712e7fd Pull in upstream fixes

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