Merging r257886: