Index: www/cxx_dr_status.html
===================================================================
--- www/cxx_dr_status.html	(revision 183606)
+++ www/cxx_dr_status.html	(working copy)
@@ -80,7 +80,7 @@
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#7">7</a></td>
     <td>NAD</td>
     <td>Can a class with a private virtual base class be derived from?</td>
-    <td class="none" align="center">No</td>
+    <td class="full" align="center">Yes</td>
   </tr>
   <tr>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#8">8</a></td>
@@ -404,7 +404,7 @@
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_closed.html#61">61</a></td>
     <td>NAD</td>
     <td>Address of static member function "<TT>&amp;p-&gt;f</TT>"</td>
-    <td class="none" align="center">No</td>
+    <td class="full" align="center">Yes</td>
   </tr>
   <tr>
     <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#62">62</a></td>
Index: lib/Sema/SemaExpr.cpp
===================================================================
--- lib/Sema/SemaExpr.cpp	(revision 183606)
+++ lib/Sema/SemaExpr.cpp	(working copy)
@@ -8316,7 +8316,15 @@
           << OrigOp.get()->getSourceRange();
         return QualType();
       }
-                  
+
+      OverloadExpr *Ovl = cast<OverloadExpr>(OrigOp.get()->IgnoreParens());
+      if (isa<UnresolvedMemberExpr>(Ovl))
+        if (!S.ResolveSingleFunctionTemplateSpecialization(Ovl)) {
+          S.Diag(OpLoc, diag::err_invalid_form_pointer_member_function)
+            << OrigOp.get()->getSourceRange();
+          return QualType();
+        }
+
       return S.Context.OverloadTy;
     }
 
Index: test/SemaTemplate/instantiate-overload-candidates.cpp
===================================================================
--- test/SemaTemplate/instantiate-overload-candidates.cpp	(revision 183606)
+++ test/SemaTemplate/instantiate-overload-candidates.cpp	(working copy)
@@ -26,7 +26,7 @@
   static T f() { T::error; } // expected-error {{has no members}}
   static T f(bool);
 };
-void (*p)() = &X<void>().f; // expected-note {{instantiation of}}
+void (*p)() = &X<void>::f; // expected-note {{instantiation of}}
 
 namespace PR13098 {
   struct A {
Index: test/CXX/drs/dr0xx.cpp
===================================================================
--- test/CXX/drs/dr0xx.cpp	(revision 183606)
+++ test/CXX/drs/dr0xx.cpp	(working copy)
@@ -627,7 +627,7 @@
   int &n = f(k);
 }
 
-namespace dr61 { // dr61: no
+namespace dr61 { // dr61: yes
   struct X {
     static void f();
   } x;
@@ -638,8 +638,7 @@
   // This is (presumably) valid, because x.f does not refer to an overloaded
   // function name.
   void (*p)() = &x.f;
-  // FIXME: This should be rejected.
-  void (*q)() = &y.f;
+  void (*q)() = &y.f; // expected-error {{cannot create a non-constant pointer to member function}}
 }
 
 namespace dr62 { // dr62: yes
Index: test/CXX/expr/expr.unary/expr.unary.op/p4.cpp
===================================================================
--- test/CXX/expr/expr.unary/expr.unary.op/p4.cpp	(revision 183606)
+++ test/CXX/expr/expr.unary/expr.unary.op/p4.cpp	(working copy)
@@ -38,6 +38,6 @@
   };
 
   void A::test() {
-    int (A::*ptr)(int) = &(A::foo); // expected-error {{can't form member pointer of type 'int (test2::A::*)(int)' without '&' and class name}}
+    int (A::*ptr)(int) = &(A::foo); // expected-error {{cannot create a non-constant pointer to member function}}
   }
 }