89060f rebase to 1.17.7

Authored and Committed by Zdenek Dohnal 6 years ago
    rebase to 1.17.7
    
        
file modified
+1 -0
file modified
+8 -7
file modified
+1 -1