dc7bf3e Merge branch 'f26' into f27

Merged and Committed by Matúš Honěk 6 years ago
    Merge branch 'f26' into f27
    
    Resolves: #1520990
    
        
file modified
+6 -1