Interim check-in, trying to get Wikipedia integration tests fixed.