b6f8e6b Update to upstream 2.1-15. 20180108

Authored and Committed by Anton Arapov 6 years ago
    Update to upstream 2.1-15. 20180108
    
    Signed-off-by: Anton Arapov <arapov@gmail.com>
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1