FIX: redirect loop on login
Merge branch 'master' into production