df560de Rebase to 4.5.0 and fix python2-django requires

Authored and Committed by mrunge 6 years ago
    Rebase to 4.5.0 and fix python2-django requires
    
        
file modified
+1 -0
file modified
+13 -10
file modified
+1 -1