Null merge of 2.6 into 2.7.

Changeset 25683ceaf341 left a new head on 2.6.