merge commit
merge commit

Merge branch 'feature/dynload-libpython' of github.com:rstudio/tensorflow into feature/dynload-libpython

# Conflicts:
#	R/python_confg.R

terrytangyuan/reticulate,rstudio/reticulate,rstudio/reticulate,terrytangyuan/reticulate,rstudio/reticulate,rstudio/reticulate,terrytangyuan/reticulate,rstudio/reticulate,rstudio/tensorflow