update to svn rev.2240