Don't try to redirect back
Merge branch 'master' into staging