sync to svn50