Merging r260164: