Index: lib/Parse/ParseDecl.cpp
===================================================================
--- lib/Parse/ParseDecl.cpp
+++ lib/Parse/ParseDecl.cpp
@@ -2616,7 +2616,12 @@
   // and attempt to recover.
   ParsedType T;
   IdentifierInfo *II = Tok.getIdentifierInfo();
-  bool IsTemplateName = getLangOpts().CPlusPlus && NextToken().is(tok::less);
+  bool IsTemplateName =
+    ((getLangOpts().CPlusPlus && NextToken().is(tok::less)) ||
+     (SS && !SS->isEmpty() &&
+      (DSC != DeclSpecContext::DSC_class &&
+       DSC != DeclSpecContext::DSC_top_level) &&
+      (NextToken().is(tok::amp) || NextToken().is(tok::star))));
   Actions.DiagnoseUnknownTypeName(II, Loc, getCurScope(), SS, T,
                                   IsTemplateName);
   if (T) {
Index: lib/Parse/ParseTentative.cpp
===================================================================
--- lib/Parse/ParseTentative.cpp
+++ lib/Parse/ParseTentative.cpp
@@ -1424,6 +1424,8 @@
             *HasMissingTypename = true;
             return TPResult::Ambiguous;
           }
+	  if (Tok.is(tok::amp) || Tok.is(tok::star))
+	    return TPResult::True;
 
           // FIXME: Fails to either revert or commit the tentative parse!
         } else {
Index: lib/Sema/SemaDecl.cpp
===================================================================
--- lib/Sema/SemaDecl.cpp
+++ lib/Sema/SemaDecl.cpp
@@ -750,11 +750,11 @@
     unsigned DiagID = diag::err_typename_missing;
     if (getLangOpts().MSVCCompat && isMicrosoftMissingTypename(SS, S))
       DiagID = diag::ext_typename_missing;
-
-    Diag(SS->getRange().getBegin(), DiagID)
-      << SS->getScopeRep() << II->getName()
-      << SourceRange(SS->getRange().getBegin(), IILoc)
-      << FixItHint::CreateInsertion(SS->getRange().getBegin(), "typename ");
+    if (!IsTemplateName)
+      Diag(SS->getRange().getBegin(), DiagID)
+	<< SS->getScopeRep() << II->getName()
+	<< SourceRange(SS->getRange().getBegin(), IILoc)
+	<< FixItHint::CreateInsertion(SS->getRange().getBegin(), "typename ");
     SuggestedType = ActOnTypenameType(S, SourceLocation(),
                                       *SS, *II, IILoc).get();
   } else {
Index: test/SemaTemplate/missing-typename.cpp
===================================================================
--- /dev/null
+++ test/SemaTemplate/missing-typename.cpp
@@ -0,0 +1,55 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s -Wno-unused
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s -Wno-unused -fms-compatibility -DMSVC
+// expected-no-diagnostics
+
+struct A {
+  typedef int BASE_VALUE;
+};
+
+void g(int &y) {}
+
+template <typename BASE_CLASS>
+void f(int &rValue) {
+  return g((BASE_CLASS::BASE_VALUE &)rValue);
+}
+
+int main() {
+  int x;
+  f<A>(x);
+}
+
+struct site_symmetry_ops {};
+
+template <class wt>
+struct class_ {
+  template <class A1>
+  void def(A1 const &a1) {}
+};
+
+template <class A1, class A2>
+struct init {
+  init() {}
+};
+
+struct special_position_site_parameter {
+  typedef char scatterer_type;
+};
+
+template <class wt>
+struct valued_asu_parameter_heir_wrapper {
+  static class_<wt> wrap(char const *name) {
+    return class_<wt>();
+  }
+};
+
+template <class wt>
+struct special_position_wrapper {
+  static void wrap(char const *name) {
+    valued_asu_parameter_heir_wrapper<wt>::wrap(name)
+        .def(init<site_symmetry_ops const &, wt::scatterer_type *>());
+  }
+};
+
+void wrap_special_position() {
+  special_position_wrapper<special_position_site_parameter>::wrap("special_position_site_parameter");
+}