Comment 4 for bug 1507845

Dan, in the interests of getting this out there, I pushed it to master for 2.10-beta, but will not be backporting it to 2.9 series for the time being. If the release maintainers decide to add it, they can, but otherwise, I'm fine with making this the practice moving forward.