Next release. Will look into pull requests from @frankier as soon as possible. At a glance, these seem likely to be merged.