add route option
Merge branch 'master' of github.com:rstudio/rstudio