Merge branch '11960-trash-events'
authorTom Clegg <tom@curoverse.com>
Fri, 14 Jul 2017 14:51:54 +0000 (10:51 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 14 Jul 2017 14:51:54 +0000 (10:51 -0400)
closes #11960

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>


Trivial merge