2ee68e9 Merge branch 'master' into f20

Merged and Committed by xhorak 8 years ago
    Merge branch 'master' into f20
    
        
file modified
+2 -0
file modified
+6 -3
file modified
+2 -2