Merging r258690: