Merging r258221: