0495f8 rebase to 1.11.4

Authored and Committed by Zdenek Dohnal 7 years ago
    rebase to 1.11.4
    
        
file modified
+4 -1