Merging r260703: