Merging r257977: