Merging r766:773 from trunk to branches/0.3.