1b11ece 3.17 update

Authored and Committed by alexpl 7 years ago
    3.17 update
    
        
file modified
+9 -9
file modified
+1 -2