diff --git a/lib/AST/CommentCommandTraits.cpp b/lib/AST/CommentCommandTraits.cpp
index dc4744a53c59a28703ba4308c2a1d73c500a6db8..2b5e624fb71aad985a09bc51b2216299476d4aaf 100644
--- a/lib/AST/CommentCommandTraits.cpp
+++ b/lib/AST/CommentCommandTraits.cpp
@@ -49,6 +49,10 @@ HelperTypoCorrectCommandInfo(SmallVectorImpl<const CommandInfo *> &BestCommand,
   const unsigned MaxEditDistance = 1;
   unsigned BestEditDistance = MaxEditDistance + 1;
   StringRef Name = Command->Name;
+  // Don't attempt trying to typo fix single character commands.
+  // \t and \n are very common
+  if (Name.size() <= 1)
+    return;
   
   unsigned MinPossibleEditDistance = abs((int)Name.size() - (int)Typo.size());
   if (MinPossibleEditDistance > 0 &&
diff --git a/test/Sema/warn-documentation-fixits.cpp b/test/Sema/warn-documentation-fixits.cpp
index 707ecb362f86743f50422a14fd4dc1590bf2914b..a5a477f66d6d91401455f18589692a2edc021f9a 100644
--- a/test/Sema/warn-documentation-fixits.cpp
+++ b/test/Sema/warn-documentation-fixits.cpp
@@ -67,6 +67,9 @@ int FooBar();
 /// \fooba bbb IS_DOXYGEN_END
 int gorf();
 
+/// \t bbb IS_DOXYGEN_END
+int Bar();
+
 // CHECK: fix-it:"{{.*}}":{5:12-5:22}:"a"
 // CHECK: fix-it:"{{.*}}":{9:12-9:15}:"aaa"
 // CHECK: fix-it:"{{.*}}":{13:13-13:23}:"T"