Fix for NoneType issues related to redirects
Merge remote-tracking branch 'origin/dev'