Merging r726:730 from trunk to branches/0.3. This forwardports everything except...