Merging r261306: