322fd1f Update to upstream version 6.0 beta

Authored and Committed by mizdebsk 6 years ago
    Update to upstream version 6.0 beta
    
        
file modified
+11 -8
file modified
+2 -2