5e6ce69 Merge branch 'master' into f25

Merged and Committed by spot 6 years ago
    Merge branch 'master' into f25
    
        
file modified
+5 -1
file modified
+4 -1