fix redirection if no redirect_to is specified
Merge branch 'join'