Merge feature/new-rstudio-server into master
#940
Merged
feature/new-rstudio-server into master
#940