Merging r259381: