1fec494 Merge branch 'master' into f27

Merged and Committed by clime 6 years ago
    Merge branch 'master' into f27
    
        
file modified
+1 -0
file modified
+3 -3
file modified
+1 -1