Merging r258207: