Merging r257730: