6553a73 Merge branch 'master' into f22

Merged and Committed by Jakub Dorňák 8 years ago
    Merge branch 'master' into f22
    
        
file modified
+5 -2