merge from svn revision 55