52df9c3 pull in upstream fixes

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