diff --git a/contrib/buildbot/ignore-logs.txt b/contrib/buildbot/ignore-logs.txt
new file mode 100644
--- /dev/null
+++ b/contrib/buildbot/ignore-logs.txt
@@ -0,0 +1,3 @@
+# Wine occasionally deadlocks during cross-builds tests. It should be safe to
+# ignore until we're able to update wine with a version where this is fixed.
+err:ntdll:RtlpWaitForCriticalSection section \\w* "\\?" wait timed out in thread \\d*, blocked by \\d*, retrying
diff --git a/contrib/buildbot/server.py b/contrib/buildbot/server.py
--- a/contrib/buildbot/server.py
+++ b/contrib/buildbot/server.py
@@ -794,6 +794,18 @@
                         }
                     )
 
+                    # Explicitly ignored log lines. Use with care.
+                    buildLog = tc.getBuildLog(buildId)
+                    for line in tc.getIgnoreList():
+                        # Skip empty lines and comments in the ignore file
+                        if not line or line[0] == '#':
+                            continue
+
+                        # If any of the ignore patterns match any line in the
+                        # build log, ignore this failure
+                        if re.search(line.decode(), buildLog):
+                            return SUCCESS, 200
+
                     # Get number of build failures over the last few days
                     numRecentFailures = tc.getNumAggregateFailuresSince(
                         buildTypeId, 60 * 60 * 24 * 5)
diff --git a/contrib/buildbot/teamcity_wrapper.py b/contrib/buildbot/teamcity_wrapper.py
--- a/contrib/buildbot/teamcity_wrapper.py
+++ b/contrib/buildbot/teamcity_wrapper.py
@@ -3,6 +3,7 @@
 from collections import UserDict
 import io
 import json
+import os
 from pprint import pprint
 import re
 import requests
@@ -50,6 +51,8 @@
         self.auth = (username, password)
         self.logger = None
         self.mockTime = None
+        with open(os.path.join(os.path.dirname(__file__), 'ignore-logs.txt'), 'rb') as ignoreList:
+            self.ignoreList = ignoreList.readlines()
 
     def set_logger(self, logger):
         self.logger = logger
@@ -61,6 +64,9 @@
         # We do not care about sub-second precision anyway.
         return int(time.time())
 
+    def getIgnoreList(self, ignoreList):
+        return self.ignoreList
+
     def setMockTime(self, mockTime):
         self.mockTime = mockTime
 
diff --git a/contrib/buildbot/test/data/testlog_ignore.zip b/contrib/buildbot/test/data/testlog_ignore.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/contrib/buildbot/test/test_endpoint_status.py b/contrib/buildbot/test/test_endpoint_status.py
--- a/contrib/buildbot/test/test_endpoint_status.py
+++ b/contrib/buildbot/test/test_endpoint_status.py
@@ -55,13 +55,15 @@
         self.configure_build_info()
         self.teamcity.get_coverage_summary = mock.Mock()
         self.teamcity.get_coverage_summary.return_value = None
+        self.teamcity.getIgnoreList = mock.Mock()
+        self.teamcity.getIgnoreList.return_value = []
 
         self.travis.get_branch_status = mock.Mock()
         self.travis.get_branch_status.return_value = BuildStatus.Success
 
     def setup_master_failureAndTaskDoesNotExist(self, latestCompletedBuildId=DEFAULT_BUILD_ID,
                                                 numRecentFailedBuilds=0, numCommits=1,
-                                                userSearchFields=None):
+                                                userSearchFields=None, buildLogFile='testlog.zip'):
         if userSearchFields is None:
             userSearchFields = {}
 
@@ -72,6 +74,8 @@
             },
         }
 
+        with open(self.data_dir / buildLogFile, 'rb') as f:
+            buildLog = f.read()
         recentBuilds = [] if numRecentFailedBuilds == 0 else [
             {'status': 'FAILURE'}, {'status': 'SUCCESS'}] * numRecentFailedBuilds
         self.teamcity.session.send.side_effect = [
@@ -83,6 +87,8 @@
                     'id': latestCompletedBuildId,
                 }],
             })),
+            test.mocks.teamcity.Response(status_code=requests.codes.not_found),
+            test.mocks.teamcity.Response(buildLog),
             test.mocks.teamcity.Response(json.dumps({
                 'build': recentBuilds,
             })),
@@ -166,7 +172,21 @@
         self.slackbot.client.chat_postMessage.assert_not_called()
 
     def test_status_master_resolveBrokenBuildTask_masterGreen(self):
-        def setupMockResponses():
+        def setupMockResponses(data):
+            afterLatestBuild = [
+                test.mocks.teamcity.Response(),
+                test.mocks.teamcity.Response(),
+            ]
+            if data.buildResult == 'failure':
+                with open(self.data_dir / 'testlog.zip', 'rb') as f:
+                    buildLog = f.read()
+                afterLatestBuild = [
+                    test.mocks.teamcity.Response(
+                        status_code=requests.codes.not_found),
+                    test.mocks.teamcity.Response(buildLog),
+                    test.mocks.teamcity.Response(),
+                ]
+
             self.teamcity.session.send.side_effect = [
                 test.mocks.teamcity.buildInfo_automatedBuild(),
                 test.mocks.teamcity.Response(json.dumps({
@@ -174,9 +194,7 @@
                         'id': DEFAULT_BUILD_ID,
                     }],
                 })),
-                test.mocks.teamcity.Response(),
-                test.mocks.teamcity.Response(),
-            ]
+            ] + afterLatestBuild
             self.phab.maniphest.search.return_value = test.mocks.phabricator.Result([{
                 'id': '123',
                 'phid': 'PHID-TASK-123',
@@ -190,13 +208,13 @@
 
         data = statusRequestData()
         data.buildResult = 'failure'
-        setupMockResponses()
+        setupMockResponses(data)
         response = self.app.post('/status', headers=self.headers, json=data)
         assert response.status_code == 200
         # Master should be marked red
 
         data = statusRequestData()
-        setupMockResponses()
+        setupMockResponses(data)
         response = self.app.post('/status', headers=self.headers, json=data)
         assert response.status_code == 200
         self.phab.differential.revision.edit.assert_not_called()
@@ -686,10 +704,52 @@
         self.phab.maniphest.edit.assert_not_called()
         self.slackbot.client.chat_postMessage.assert_not_called()
 
+    def test_status_master_failureAndTaskDoesNotExist_ignoreFailure(self):
+        testPatterns = [
+            # Simple match
+            b'err:ntdll:RtlpWaitForCriticalSection',
+            # Greedy match with some escaped characters
+            b'\\d*:err:ntdll:RtlpWaitForCriticalSection section .* retrying \\(60 sec\\)',
+            # Less greedy match
+            b'err:ntdll:RtlpWaitForCriticalSection section \\w* "\\?" wait timed out in thread \\d*, blocked by \\d*, retrying',
+        ]
+        for pattern in testPatterns:
+            self.teamcity.getIgnoreList.return_value = [
+                b'# Some comment followed by an empty line',
+                b'',
+                pattern,
+            ]
+            data = statusRequestData()
+            data.buildResult = 'failure'
+
+            self.setup_master_failureAndTaskDoesNotExist(
+                buildLogFile='testlog_ignore.zip')
+
+            response = self.app.post(
+                '/status', headers=self.headers, json=data)
+            assert response.status_code == 200
+            self.phab.differential.revision.edit.assert_not_called()
+
+            self.teamcity.session.send.assert_called_with(AnyWith(requests.PreparedRequest, {
+                'url': self.teamcity.build_url(
+                    "downloadBuildLog.html",
+                    {
+                        "buildId": DEFAULT_BUILD_ID,
+                        "archived": "true",
+                        "guest": 1,
+                    }
+                )
+            }))
+
+            self.phab.maniphest.edit.assert_not_called()
+            self.slackbot.client.chat_postMessage.assert_not_called()
+
     def test_status_master_failureAndTaskExists(self):
         data = statusRequestData()
         data.buildResult = 'failure'
 
+        with open(self.data_dir / 'testlog.zip', 'rb') as f:
+            buildLog = f.read()
         self.teamcity.session.send.side_effect = [
             test.mocks.teamcity.buildInfo_automatedBuild(),
             test.mocks.teamcity.Response(json.dumps({
@@ -697,6 +757,8 @@
                     'id': DEFAULT_BUILD_ID,
                 }],
             })),
+            test.mocks.teamcity.Response(status_code=requests.codes.not_found),
+            test.mocks.teamcity.Response(buildLog),
             test.mocks.teamcity.Response(),
         ]