diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 53dc97a..1854d70 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -333,7 +333,9 @@
       if (!DryRun)
         replaceWhitespace(Current, 0, Spaces);
 
-      if (RootToken.isNot(tok::kw_for) &&
+      // FIXME: Do we need to do this for assignments nested in other
+      // expressions?
+      if (RootToken.isNot(tok::kw_for) && ParenLevel == 0 &&
           (getPrecedence(Previous) == prec::Assignment ||
            Previous.is(tok::kw_return)))
         State.Indent[ParenLevel] = State.Column + Spaces;
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 495fc7f..d4e5a51 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -816,8 +816,9 @@
       "}");
 
   verifyFormat(
+      // FIXME: Does an expression like this ever make sense? If yes, fix.
       "if (int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 100000000 +\n"
-      "                                                           10000000) {\n"
+      "    10000000) {\n"
       "}");
 }
 
@@ -872,7 +873,10 @@
   verifyFormat("template <typename T>\n"
                "void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
                "    int aaaaaaaaaaaaaaaaa);");
-
+  verifyFormat(
+      "template <typename T1, typename T2 = char, typename T3 = char,\n"
+      "          typename T4 = char>\n"
+      "void f();");
 }
 
 TEST_F(FormatTest, UnderstandsTemplateParameters) {