9756e21 Pull in latest fixes from 9.4 branch

Authored and Committed by mbooth 6 years ago
    Pull in latest fixes from 9.4 branch
    
        
file modified
+3 -0
file modified
+43 -9
file modified
+116 -110
file modified
+34 -21
file modified
+2 -2