7854e70 Incorporate more changes requested in upstream review and commited upstream (#1157720)

Authored and Committed by Elio Maldonado 7 years ago
    Incorporate more changes requested in upstream review and commited upstream (#1157720)
    
    - still keeping two separate patches
    
        
file modified
+2 -2