Merging ocropus (master) and tesseract branches, step 1.