Document danger of infinite loop
Merge branch 'master' into event-notifications