Merging r257648: