sync to svn r49