Merging r732:766 from trunk to branches/0.3.