Merge branch '10008-check-token-exp-on-open' refs #10008
authorTom Clegg <tom@curoverse.com>
Wed, 26 Oct 2016 15:40:42 +0000 (11:40 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Oct 2016 15:40:42 +0000 (11:40 -0400)

Trivial merge