6db5d46 Merge branch 'master' into f25

Merged and Committed by clime 7 years ago
    Merge branch 'master' into f25
    
        
file modified
+1 -0
file modified
+33 -9
file modified
+1 -1