Merge branch '10236-disable-event-listening'
authorLucas Di Pentima <lucas@curoverse.com>
Thu, 13 Oct 2016 16:59:35 +0000 (13:59 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Thu, 13 Oct 2016 16:59:35 +0000 (13:59 -0300)
Closes #10236


Trivial merge