f8d7b02 Update to upstream 2.1.2.

Authored and Committed by akurtakov 7 years ago
    Update to upstream 2.1.2.
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1