6b1366c Merge branch 'master' into f20

Merged and Committed by Martin Stransky 8 years ago
    Merge branch 'master' into f20
    
        
file modified
+4 -1