c8c316e Merge branch 'master' into f24

Merged and Committed by xhorak 8 years ago
    Merge branch 'master' into f24
    
        
file modified
+3 -4