c1037e4 Merge branch 'master' into f21

Merged and Committed by sharkcz 9 years ago
    Merge branch 'master' into f21
    
        
file modified
+8 -1