Merge branch '10291-really-disable-apis' closes #10291
authorTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 15:53:49 +0000 (11:53 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 15:53:49 +0000 (11:53 -0400)

Trivial merge