It looks like this patch is redundant with what's actually pending. I think all I need to do is upload the tip of master. If I missed anything let me know.
-- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
