Comment 4 for bug 277104

See my comment on bug #267297.

At this stage in the release process, backporting individual fixes is likely safer than pulling in a new git snapshot, since the former usually involves a tighter review process and the latter can sometimes bring in risk of regressions. But it looks like most of the changes in git are fixing bugs we need fixes for, and the rest of the changes look modest/safe. I'll go ahead and pull the snapshot.