aa4797a pull in upstream fixes

Authored and Committed by rdieter 5 years ago
    pull in upstream fixes
    
        
file modified
+3 -0
file modified
+7 -1
file modified
+3 -0