Merge fixes from trunk, rev 220.