fix(redirection)
Merge branch 'master' into raghav