491522b rebase to 1.11.6

Authored and Committed by zdohnal 7 years ago
    rebase to 1.11.6
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1