Merge pull request #630 from akvo/feature/629-incorrect-repeat-index-in-the-old-repeat-group-format