am 812b6426: Merge "Fix caption rendering" into klp-dev

* commit '812b64264176cb8a253a8253074bc9595503d2ac':
  Fix caption rendering