099fa66 Merge branch 'master' into f24

Merged and Committed by martinkg 7 years ago
    Merge branch 'master' into f24
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+3 -6