Issue #13916: Fix surrogatepass error handler on Windows
Fix a small typo in test_importlib.
Issue #21503: Use test_both() consistently in test_importlib.
Upgrade setuptools to 3.6
Upgrade pip to 1.5.6