Merge branch 'vanilla5'

# Conflicts:
#	include/tesseract/baseapi.h
#	src/api/baseapi.cpp
#	src/ccmain/control.cpp
#	src/ccmain/fixxht.cpp
#	src/ccmain/pageiterator.cpp
#	src/ccmain/resultiterator.cpp
#	src/ccmain/tesseractclass.cpp
#	src/ccmain/tesseractclass.h
#	src/ccmain/tfacepp.cpp
#	src/ccstruct/pageres.h
#	src/ccutil/ambigs.cpp
#	src/ccutil/genericvector.h
#	src/classify/classify.h
#	src/dict/stopper.cpp
#	src/lstm/plumbing.h
#	src/textord/colfind.cpp
#	src/wordrec/language_model.h
#	src/wordrec/wordclass.cpp

include/tesseract/baseapi.h

@@ -353,7 +353,7 @@ class TESS_API TessBaseAPI {
            const std::vector<std::string> *vars_values,
            bool set_only_non_debug_params, FileReader reader);
 
-/** @} */
+  /** @} */
 
   /**
    * Returns the languages string used in the last valid initialization.