60e1f8c Merge branch 'master' into f27

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