0d4656d rebase to 1.11.5

Authored and Committed by zdohnal 7 years ago
    rebase to 1.11.5
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1