36c1c70 Rebase to 4.1.6

Authored and Committed by mstevens 5 years ago
    Rebase to 4.1.6
    
        
file modified
+20 -4
file modified
+4 -4
file modified
+13 -31
file modified
+1 -1