Merging r259958: