0471cf3 Merge remote-tracking branch 'origin/f27' into f26

Merged and Committed by Jan Kratochvil 6 years ago
    Merge remote-tracking branch 'origin/f27' into f26
    
        
file modified
+4 -1