Comment 7 for bug 1776913

Thanks, Galen. That's good to know. There was a small merge conflict for rel_3_1, but nothing too bad.

I merged this into master, rel_3_3, rel_3_2, and rel_3_1. Thanks, everyone!