Merging r257940: