am 0d54e471: Merge "Remove code markers"

* commit '0d54e471fa90c2759e86dc47c642f7af277a50f0':
  Remove code markers