Merge branch 'master' into origin-2608-websocket-event-bus-alt2
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Apr 2014 17:08:31 +0000 (13:08 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Apr 2014 17:08:31 +0000 (13:08 -0400)

Trivial merge