Comment 17 for bug 1806087

Thanks for taking care of this so fast, Bill. Changes look good and work fine for me. Sorry for not seeing this sooner!

I've pushed this to master, but not in time for beta1. I am going to mark as fixed committed for beta1, though, since that is were *most* of it is, and will also try not to make bad plans about keeping bugs open when commits might span milestones.