Merge branch '6705-fix-websockets-replay' closes #6705
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 24 Jul 2015 18:38:47 +0000 (14:38 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 24 Jul 2015 18:39:03 +0000 (14:39 -0400)

Trivial merge