Comment 13 for bug 1740412

Thank you Michele and Bill! I've signed off on the code and merged it to master and release 3.1.

There was a conflict when I tried backporting it to backport it to 3.0. It wasn't immediately clear to me how to resolve the conflict. I'll leave to 3.0 target for now in case anyone wants to create a 3.0 branch with the conflict resolved.