Merging r259696: