don't duplicate route args when redirecting #352
Merge remote-tracking branch 'origin/next' into next