Merge branch 'master' into amakeev/attach-tests

# Conflicts:
#	platform/platform-impl/src/com/intellij/execution/process/ProcessUtils.java
#	platform/platform-impl/src/com/intellij/execution/process/impl/OSProcessManagerImpl.java

python/helpers/pydev/pydevd_concurrency_analyser/pydevd_concurrency_logger.py

@@ -239,7 +239,7 @@ class ThreadingLogger:
             traceback.print_exc()
 
 
-class NameManager():
+class NameManager:
     def __init__(self, name_prefix):
         self.tasks = {}
         self.last = 0

python/helpers/pydev/pydevd_concurrency_analyser/pydevd_thread_wrappers.py

@@ -1,7 +1,9 @@
 
 import _pydev_threading as threading
-import functools
-
+try:
+    import functools
+except:
+    pass
 
 def wrapper(fun):
     def pydev_after_run_call():