Fix event adding multiple times.
Merge branch 'master' into gh-pages