Block addEventListener as well.
Merge branch 'master' into develop

Conflicts:
	src/util/dom.js