Merge branch 'CRAN' of https://github.com/stan-dev/rstan into CRAN