5dbb9a0 pull in some upstream fixes

Authored and Committed by Rex Dieter 7 years ago
    pull in some upstream fixes
    
        
file modified
+2 -0
file modified
+6 -1
file modified
+2 -0