Merging r800:803 from trunk to branches/0.3.