Ok, just switch to Pillow
Merge branch 'master' into account-creation-fixes
Fix 'return_to' redirect after user login