Merging r258168: