Merging r258386: