Fixes a Auth redirect loop
Merge branch 'origin/master'