Merging r259645: