Committed Don's changes to the trunk