3ee5d4 Merge branch 'f26' into f27

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