0b0a5c2 pull in upstream fixes

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