change failure redirect
Merge branch 'master' into release