6b4bb36 Cherry-pick upstream commit for #1401750

Authored and Committed by cbm 7 years ago
    Cherry-pick upstream commit for #1401750
    
        
file modified
+6 -1