Merge branch '5207-expires-at-time' closes #5207
authorTom Clegg <tom@curoverse.com>
Mon, 16 Mar 2015 21:19:16 +0000 (17:19 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 16 Mar 2015 21:19:16 +0000 (17:19 -0400)

Trivial merge