am 71c7fc7f: am bb45c8ac: Merge "Internal subtitle base support" into klp-dev

* commit '71c7fc7f16d6f04acf226c16051c093e93d12b8c':
  Internal subtitle base support