Merge branch '3021-leave-api-running' refs #3021
authorTom Clegg <tom@curoverse.com>
Fri, 6 Feb 2015 22:30:31 +0000 (17:30 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 6 Feb 2015 22:30:31 +0000 (17:30 -0500)

Trivial merge