merge all the tesseract svn changes