Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -986,7 +986,18 @@
                     downloadBinary=False,
                     runTest=True,
                     extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=True",
-                                      "-DLLVM_USE_LINKER=gold"])}
+                                      "-DLLVM_USE_LINKER=gold"])},
+        {'name': "lldb-x64-windows-ninja",
+         'slavenames': ["win-py3-buildbot"],
+         'builddir': "lldb-x64-windows-ninja",
+         'category' : 'lldb',
+         'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(
+                    clean=True,
+                    python_source_dir="C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\Python36_64",
+                    vs='%VS150COMNTOOLS%',
+                    target_arch='x64',
+                    test=True,
+                    extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=OFF'])}
        ]
 
 # LLD builders.
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -99,6 +99,9 @@
         # Windows 7 Intel(R) Xeon(R) CPU E5-2680 (2.80GHz), 16GB of RAM
         create_slave("windows7-buildbot", properties={'jobs': 2}, max_builds=1),
 
+        # Windows Server 2016 Intel Xeon(R) Quad 2.30 GHz, 56GB of RAM
+        create_slave("win-py3-buildbot", properties={'jobs' : 64}, max_builds=1),
+
         # POWER7 PowerPC big endian (powerpc64)
         create_slave("ppc64be-clang-test", properties={'jobs': 16}, max_builds=1),
         create_slave("ppc64be-clang-lnt-test", properties={'jobs': 16}, max_builds=1),
Index: zorg/trunk/buildbot/osuosl/master/config/status.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py
+++ zorg/trunk/buildbot/osuosl/master/config/status.py
@@ -255,4 +255,13 @@
             builders = ["clang-openbsd-amd64"],
             addLogs=False,
             num_lines = 15),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers = False,
+            extraRecipients = ["stilis@microsoft.com"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = ["lldb-x64-windows-ninja"],
+            addLogs=False,
+            num_lines = 15),
         ]