Merge branch '11070-ws-listener-problem'
authorTom Clegg <tom@curoverse.com>
Fri, 10 Feb 2017 22:08:46 +0000 (17:08 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 10 Feb 2017 22:08:46 +0000 (17:08 -0500)
closes #11070


Trivial merge