Merging r257666: