9e000e5 merge branch f24 into f25

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