am bf2c3b67: am ef319302: am 522e67e4: (-s ours) am de3ac8f9: am 92480a9a: Fix include tag rendering. [DO NOT MERGE]

* commit 'bf2c3b679018d4a993a370e998b5e3276d052045':
  Fix include tag rendering. [DO NOT MERGE]