37fbaab pull in upstream fixes

Authored and Committed by Rex Dieter 7 years ago
    pull in upstream fixes
    
        
file modified
+9 -5
file modified
+15 -1
file modified
+9 -0