Merging r258611: