Merge branch 'master' into origin-2608-websocket-event-bus-alt2
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 25 Apr 2014 19:44:47 +0000 (15:44 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 25 Apr 2014 19:44:47 +0000 (15:44 -0400)

Trivial merge