8f07a3a Update with patches from upstream master

Authored and Committed by Jakub Ruzicka 10 years ago
    Update with patches from upstream master
    
        
file added
+23
file modified
+39 -1