Merging r261360: