Merge branch '10764-ws-tests'
authorTom Clegg <tom@curoverse.com>
Wed, 1 Mar 2017 20:04:34 +0000 (15:04 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 1 Mar 2017 20:04:34 +0000 (15:04 -0500)
closes #10764


Trivial merge