Merging r258103: