58a370 Update to upstream version 42

Authored and Committed by Michael Simacek 7 years ago
    Update to upstream version 42
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1