Merge branch '3692-event-bus-fix-and' closes #3692
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 14 Oct 2014 15:41:02 +0000 (11:41 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 15 Oct 2014 17:53:35 +0000 (13:53 -0400)

Trivial merge