Merged into 2.6.10.

.