Finally, it's also merged into my `freebsd_new` branch, which is in PR #342.