Merging r257645: