Merge pull request #3577 from MikePetullo/eventlog