Merging r820:825 from trunk to branches/0.3