Merging r260390: