a672fb5 pull in upstream branch fixes

Authored and Committed by rdieter 4 years ago
    pull in upstream branch fixes
    
        
file modified
+2 -0
file modified
+8 -1
file modified
+2 -0