6e84bc9 Upstream release 3.6

Authored and Committed by michich 4 years ago
    Upstream release 3.6
    
    Plus a couple of fixes from upstream git.
    
        
file modified
+1 -0
file modified
+9 -3
file modified
+1 -1