Merging r258184: