Merging r258922: