89c3b1b Merge branch 'master' into f26

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