Merging r259840 on top of r259178: