Merging -r804:811 from trunk to branches/0.3.