Merging r259375: