Merging r260641: