Null merge of 2.6 into 2.7.

Changeset 50803d881a92 left a new dangling head on 2.6, and the
change was applied separately to 2.7 in changeset 1cd24ea5abeb.