Merging r259228: