Merging r259649: