Fix router.js
Merge branch '1.x'