Merging r258609: