Merging r259702: