Merge branch '10669-safe-http-cache'
authorTom Clegg <tom@curoverse.com>
Thu, 23 Mar 2017 14:56:34 +0000 (10:56 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 23 Mar 2017 14:56:34 +0000 (10:56 -0400)
closes #10669


Trivial merge