b10b01c merge with f25 branch

Merged and Committed by Alex Kashchenko 7 years ago
    merge with f25 branch
    
        
file modified
+1 -0
file added
+158
file added
+12
file removed
-691
file removed
-402
file removed
-54
file removed
-8834
file removed
-28
file removed
-6809
file removed
-12
file added
+11
file modified
+109 -63
file modified
+39 -71
file added
+11
file modified
+2 -2