240bc4c Merge branch 'master' into f24

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