17a111d Rebase to version 6.04

Authored and Committed by ljavorsk a year ago
    Rebase to version 6.04
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+1 -1