09d2d89 Cherry-pick 696a2a9 from master

Authored and Committed by Andrea Veri 8 years ago
    Cherry-pick 696a2a9 from master
    
        
file modified
+7 -4