Merging r261387: