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