7fd17cb Merge branch 'master' into f21

Merged and Committed by Petr Jašíček 8 years ago
    Merge branch 'master' into f21
    
        
file modified
+10 -0
file modified
+4 -1