881eb20 pull in upstream (16.12 branch) fixes

Authored and Committed by Rex Dieter 7 years ago
    pull in upstream (16.12 branch) fixes
    
        
file modified
+3 -2
file modified
+3 -0
file modified
+9 -9