9c78d27 Merge branch 'master' into f27

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