a25652 Merge branch 'master' into f25

Merged and Committed by Jan Synacek 8 years ago
    Merge branch 'master' into f25
    
        
file modified
+2 -0
file modified
+5 -3
file modified
+1 -1