Comment 16 for bug 1656036

Thank you Bill and Jason! It looks good to me too. I resolved a conflict and merged the code to master and 3.0. The merge conflicts were a lot more extensive for 2.12, so I decided not to backport that far.

I'll update the targets as soon as I add a 3.0.2 milestone launchpad.