Merging r258471: