Fix ConcurrentModificationException in SubscriptionContext
Merge pull request #1049 from aledsage/fix/ConcurrentModificationException

Fix ConcurrentModificationException in SubscriptionContext