06b3fec Merge remote-tracking branch 'origin/master' into f23

Merged and Committed by praiskup 4 years ago
    Merge remote-tracking branch 'origin/master' into f23
    
    Version: 481-5
    
        
file modified
+12 -6
file modified
+6 -2
file modified
+20 -5
file modified
+20 -2