fix #1215 / Avoid ConcurrentModification during iteration
Merge pull request #1221 from skywave/merge_modules

fix #1215 / Avoid ConcurrentModification during iteration