d660478 - Rebase to 3.8.2 (#1512678)

Authored and Committed by sharkcz 6 years ago
    - Rebase to 3.8.2 (#1512678)
    
        
file modified
+1 -0
file modified
+7 -5
file modified
+1 -1