Merge "Fix a ConcurrentModificationException crash." into pi-dev