Bug fixes in source/server/router.js
Merge branch 'master' into ogprod