Merge branch 'master' into feature/packrat-restore-actions
Merge branch 'feature/packrat-restore-actions' of github.com:rstudio/rstudio into feature/packrat-restore-actions