8460: Merge branch 'master' into 8460-websocket-go
authorTom Clegg <tom@curoverse.com>
Tue, 15 Nov 2016 18:25:03 +0000 (13:25 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 15 Nov 2016 18:25:03 +0000 (13:25 -0500)

Trivial merge