[Olena-patches] olena: olena-2.0-586-g8255583 Fix merge conflicts with ICDAR13 recognition table work from Roland

This is a merge commit message of the following branches: Merge: cd3eaf5 f16ceed hooks/post-receive -- Olena, a generic and efficient image processing platform