Ensure that downloads stop quickly. automerge: da9d77a
Jeff Sharkey [Tue, 28 Oct 2014 03:36:32 +0000 (03:36 +0000)]
automerge: 94a5718

* commit '94a5718e1d7c4b8ab2bf4c6a45ed9f1be187ef4b':
  Ensure that downloads stop quickly.


Trivial merge