8f1b1e2 Merge branch 'f26' into f25

Merged and Committed by jvymazal 6 years ago
    Merge branch 'f26' into f25
    
        
file modified
+1 -0
file modified
+13 -1
file modified
+1 -1