I've merged blead-next into blead (after rebasing it, squashing, and
rewording some commits), so now you have your latest stuff against
blead. No merge conflicts.
Enjoy!
(And thank you for your patience.)
blead is unfrozen now, blead-next merged in
by Sawyer X