99c4af5 merge f24 branch

Merged and Committed by Alex Kashchenko 7 years ago
    merge f24 branch
    
        
file added
+49
file modified
+37 -10