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

Conflicts:
	TODO