Merging r261039: