Merging r261368: