aa89dee pull in upstream fix(es)

Authored and Committed by rdieter 6 years ago
    pull in upstream fix(es)
    
        
file modified
+2 -0
file modified
+5 -7
file modified
+2 -0