am 1df2557a: Merge "Remove code markers"

* commit '1df2557ac95a6d8a087fb15f6f842dc049f2759b':
  Remove code markers