Merge change I51438c18 into eclair-mr2

* changes:
  the vertex index should be "first + i".