Sync with router.js
Merge pull request #2592 from machty/routerjs-sync

Sync with router.js