silence deprecated warnings on OS X 10.10 SDK
Merge branch 'master' of github.com:rstudio/rstudio