2de6e6 Merge branch 'f25' into f26

Merged and Committed by Zdenek Dohnal 7 years ago
    Merge branch 'f25' into f26
    
        
file removed
-59977
file modified
+1 -3
file modified
+4 -3