Merging r257905: