4e54673 pull in upstream fixes

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