Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	rstan/rstan/inst/include/rstan/io/rlist_ref_var_context.hpp
	rstan/rstan/inst/unitTests/test_rlist_ref_var_context.cpp