69dd6af Backport patches after 3.34.1 from stable branch

Authored and Committed by Jonas Ã…dahl 4 years ago
    Backport patches after 3.34.1 from stable branch
    
        
file modified
+7 -1