I've been using a Cargo patch to pull in `master` to get #505 and #506, which have been working well for me in testing. Would it be possible to cut a patch release that includes those two PRs?
