This is an "ours" merge to avoid taking a40d2123834cd55e77ed7668, which quiets a warning we'd like to keep seeing in alphas.
Nick Mathewson