(#140) EventBus: make timeout configurable
Merge branch 'feature-0.x/140-eventbus-configurable-timeout' into master-0.x

* feature-0.x/140-eventbus-configurable-timeout:
  (#140) EventBus: make timeout configurable