google redirects ended up being necessary
Merge branch 'develop'