95809d Merge branch 'f26' into f27

Merged and Committed by Zdenek Dohnal 7 years ago
    Merge branch 'f26' into f27
    
        
file modified
+47 -26
file modified
+6 -0