Merge remote-tracking branch 'upstream/v1.2.x'

Author: mdboom

setup.py

@@ -305,7 +305,7 @@ def run_2to3(self, files):
             # We need to skip certain files that have already been
             # converted to Python 3.x
             filtered = [x for x in files if should_2to3(x, self.build_lib)]
-            if sys.platform.startswith('win'):
+            if sys.platform.startswith('win') or 'TRAVIS' in os.environ:
                 # doing this in parallel on windows may crash your computer
                 [refactor(f) for f in filtered]
             else: