Merging r260733: