3df9ef9 pull in upstream fixes

Authored and Committed by rdieter 4 years ago
    pull in upstream fixes
    
        
file modified
+2 -0
file modified
+6 -1
file modified
+2 -0