Merging r258436: