Merging r261033: