31c45e8 Merge branch 'master' into f27

Merged and Committed by spot 6 years ago
    Merge branch 'master' into f27
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -2