Fixed issue with the redirect not being encoded
Merge remote-tracking branch 'origin/master'