merge commit
merge commit

Merge remote-tracking branch 'origin/master' into feature/raw-to-bytearray

# Conflicts:
#	NEWS.md

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