Merging r259695: