320e37a Merge branch 'master' into f26

Merged and Committed by martinkg 5 years ago
    Merge branch 'master' into f26
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+5 -5