Properly handle session timeout, or its absence.
Merge branch 'master' of github.com:rstudio/shiny-server