ff192a9 Incorporate some changes requested in upstream review and commited upstream (#1157720)

Authored and Committed by Elio Maldonado 7 years ago
    Incorporate some changes requested in upstream review and commited upstream (#1157720)
    
        
file modified
+25 -59
file modified
+4 -1