Merging r261384: