Merging r812:820 from trunk to branches/0.3.