merge from svn revision 68