Merging r258729: