[BUGFIX beta] Sync router.js, closes #4399, retry() bug
Merge pull request #4736 from machty/router-context-fallback

[BUGFIX beta] Sync router.js, closes #4399, retry() bug