7913a9 Merge branch 'f26' into f27

Merged and Committed by Zdenek Dohnal 7 years ago
    Merge branch 'f26' into f27
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+5 -2