8d41e4c update master from f24 branch

Authored and Committed by Alex Kashchenko 7 years ago
    update master from f24 branch
    
        
file modified
+54 -42