windows sync
windows sync

Merge branch 'master' of https://github.com/chjackson/flexsurv-dev

Conflicts:
	tests/extra/ebmt.R