Merging r258971: