Merging r257875: