Merging r261258: