Merging r259740: