diff --git a/lib/Option/Option.cpp b/lib/Option/Option.cpp
index f1b7941e498..bed779ad554 100644
--- a/lib/Option/Option.cpp
+++ b/lib/Option/Option.cpp
@@ -22,12 +22,10 @@ using namespace llvm::opt;
 Option::Option(const OptTable::Info *info, const OptTable *owner)
   : Info(info), Owner(owner) {
 
-  // Multi-level aliases are not supported, and alias options cannot
-  // have groups. This just simplifies option tracking, it is not an
-  // inherent limitation.
-  assert((!Info || !getAlias().isValid() || (!getAlias().getAlias().isValid() &&
-         !getGroup().isValid())) &&
-         "Multi-level aliases and aliases with groups are unsupported.");
+  // Multi-level aliases are not supported. This just simplifies option
+  // tracking, it is not an inherent limitation.
+  assert(!Info || !getAlias().isValid() || !getAlias().getAlias().isValid() &&
+         "Multi-level aliases are not supported.");
 }
 
 Option::~Option() {
diff --git a/unittests/Option/OptionParsingTest.cpp b/unittests/Option/OptionParsingTest.cpp
index 8bfa99b5de4..2c4fdcfa2c7 100644
--- a/unittests/Option/OptionParsingTest.cpp
+++ b/unittests/Option/OptionParsingTest.cpp
@@ -136,3 +136,12 @@ TEST(Option, ParseWithFlagExclusions) {
   EXPECT_EQ(AL->getLastArgValue(OPT_SLASH_C), "foo");
   EXPECT_EQ(AL->getLastArgValue(OPT_C), "bar");
 }
+
+TEST(Option, ParseAliasInGroup) {
+  TestOptTable T;
+  unsigned MAI, MAC;
+
+  const char *MyArgs[] = { "-I" };
+  OwningPtr<InputArgList> AL(T.ParseArgs(MyArgs, array_endof(MyArgs), MAI, MAC));
+  EXPECT_TRUE(AL->hasArg(OPT_H));
+}
diff --git a/unittests/Option/Opts.td b/unittests/Option/Opts.td
index ccb377fc7e5..8e33ba8580b 100644
--- a/unittests/Option/Opts.td
+++ b/unittests/Option/Opts.td
@@ -16,3 +16,6 @@ def G : JoinedAndSeparate<["-"], "G">, HelpText<"The G option">, MetaVarName<"G"
 def Ceq : Joined<["-", "--"], "C=">, Alias<C>, Flags<[OptFlag1]>;
 
 def H : Flag<["-"], "H">, Flags<[HelpHidden]>;
+
+def my_group : OptionGroup<"my group">;
+def I : Flag<["-"], "I">, Alias<H>, Group<my_group>;