import from svn at revision 2587