am f8625381: am 2b3509c9: Merge change I51438c18 into eclair-mr2

Merge commit 'f86253816b7166096111d29cb3708b1156f7ebf3'

* commit 'f86253816b7166096111d29cb3708b1156f7ebf3':
  the vertex index should be "first + i".