ee8847 Update to upstream version 4.2.0

Authored and Committed by msrb 5 years ago
    Update to upstream version 4.2.0
    
        
file modified
+1 -0
file removed
-58
file modified
+84 -26
file modified
+1 -1
file removed
-227