Fix for tornado redirect function, was not properly returning.
Merge remote-tracking branch 'upstream/dev' into testing2