diff --git a/.gitignore b/.gitignore
index 3d2c376fcd..b0c2f90ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@
 /third_party/asan
 /third_party/binutils
 /third_party/clang_format
+/third_party/colorama
 /third_party/cygwin
 /third_party/directxsdk
 /third_party/expat
diff --git a/tools/valgrind-webrtc/tsan_v2/suppressions.txt b/tools/valgrind-webrtc/tsan_v2/suppressions.txt
index 2591157b99..e783cd3011 100644
--- a/tools/valgrind-webrtc/tsan_v2/suppressions.txt
+++ b/tools/valgrind-webrtc/tsan_v2/suppressions.txt
@@ -35,3 +35,12 @@ race:talk/base/thread.cc
 # third_party/usrsctp
 # TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492
 race:third_party/usrsctp/usrsctplib/user_sctp_timer_iterate.c
+
+# Potential deadlocks detected after roll in r6516.
+# https://code.google.com/p/webrtc/issues/detail?id=3509
+deadlock:talk/base/criticalsection.h
+deadlock:talk/base/sigslot.h
+deadlock:webrtc/system_wrappers/source/critical_section_posix.cc
+deadlock:webrtc/system_wrappers/source/rw_lock_posix.cc
+deadlock:webrtc/system_wrappers/source/thread_posix.cc
+