Damn, unfortunately this PR has gone stale because of changes in `master`, the conflicts can't just be resolved in the Github UI so you @bvirlet would have to rebase onto `master` locally and then push this up again.