Comment 7 for bug 1878079

Thanks, Bill! Works well for me. Pushed to master and rel_3_5.

The 3.4 backport had some merge conflicts. I've tried to resolve those (user/sandbergja/LP1878079_rel_3_4_backport). It's compiling, but I haven't had a chance to make sure that the functionality is the same. I'll finish testing that out today or tomorrow.