b4661d6 Merge branch 'master' into f25

Merged and Committed by jistone 7 years ago
    Merge branch 'master' into f25
    
        
file modified
+8 -0
file modified
+78 -55
file modified
+1 -1
file modified
+8 -8