sync common changes
Merge branch 'master' of github.com:chjackson/flexsurv-dev