Merge pull request #175 from akvo/feature/174-eng-1326-form-repeat-group-issues