98a130c rebase to 1.12.0

Authored and Committed by zdohnal 7 years ago
    rebase to 1.12.0
    
        
file modified
+16 -4