Merging r258273: