Merge pull request #6601 from MikePetullo/eventlog