5a494e9 Update to upstream version 2.0-M7

Authored and Committed by mizdebsk 6 years ago
    Update to upstream version 2.0-M7
    
        
file modified
+1 -0
file modified
+5 -7
file modified
+1 -1