5d710c Update to upstream version 3.12

Authored and Committed by mizdebsk 7 years ago
    Update to upstream version 3.12
    
        
file modified
+1 -1
file modified
+7 -4