merged in all changes done to the trunk up to Aug 28