3630e16 Update to upstream version 7.0.4

Authored and Committed by mkoncek 5 years ago
    Update to upstream version 7.0.4
    
        
file modified
+1 -0
file modified
+12 -10
file modified
+1 -1