diff --git a/core/pom.xml b/core/pom.xml
index 207c23746d6ec2db69a7f904661cdbccfa609aba..2df7c4190bfd92c4fb09f54031a5b1fda4e4b668 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -274,7 +274,7 @@
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler</artifactId>
-      <version>1.62</version>
+      <version>1.63</version>
     </dependency>
     <dependency>
       <groupId>org.kohsuke</groupId>
diff --git a/core/src/main/java/hudson/matrix/MatrixRun.java b/core/src/main/java/hudson/matrix/MatrixRun.java
index 08fca765f2225c72103bdc8f9b88cfc58b41936d..d8e7bb35d47d2876f56dc718c5cc6b904d023f4c 100644
--- a/core/src/main/java/hudson/matrix/MatrixRun.java
+++ b/core/src/main/java/hudson/matrix/MatrixRun.java
@@ -31,6 +31,20 @@ public class MatrixRun extends Build<MatrixConfiguration,MatrixRun> {
         super(project, buildDir);
     }
 
+    public String getUpUrl() {
+        StaplerRequest req = Stapler.getCurrentRequest();
+        if(req!=null) {
+            List<Ancestor> ancs = req.getAncestors();
+            for( int i=1; i<ancs.size(); i++) {
+                if(ancs.get(i).getObject()==this) {
+                    if(ancs.get(i-1).getObject() instanceof MatrixBuild) {
+                        return ancs.get(i-1).getUrl()+'/';
+                    }
+                }
+            }
+        }
+        return super.getDisplayName();
+    }
 
     public String getDisplayName() {
         StaplerRequest req = Stapler.getCurrentRequest();
diff --git a/core/src/main/java/hudson/maven/MavenBuild.java b/core/src/main/java/hudson/maven/MavenBuild.java
index 9d30bdf2a299e1c9613407c906b6854c258bc2f5..806c0a854c4701e5ada991e1229ab0230c18c10f 100644
--- a/core/src/main/java/hudson/maven/MavenBuild.java
+++ b/core/src/main/java/hudson/maven/MavenBuild.java
@@ -71,6 +71,23 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
         super(project, buildDir);
     }
 
+    @Override
+    public String getUpUrl() {
+        StaplerRequest req = Stapler.getCurrentRequest();
+        if(req!=null) {
+            List<Ancestor> ancs = req.getAncestors();
+            for( int i=1; i<ancs.size(); i++) {
+                if(ancs.get(i).getObject()==this) {
+                    if(ancs.get(i-1).getObject() instanceof MavenModuleSetBuild) {
+                        // if under MavenModuleSetBuild, "up" means MMSB
+                        return ancs.get(i-1).getUrl()+'/';
+                    }
+                }
+            }
+        }
+        return super.getUpUrl();
+    }
+
     @Override
     public String getDisplayName() {
         StaplerRequest req = Stapler.getCurrentRequest();
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 2769abd6c1a4b667a1ce85b46d6e3fbe90fb76e0..debd48cdc93466a78ef78ca977caffef6488b8ba 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -3,7 +3,9 @@ package hudson.model;
 import hudson.Launcher;
 import hudson.Proc.LocalProc;
 import hudson.Util;
+import hudson.Functions;
 import hudson.matrix.MatrixConfiguration;
+import hudson.matrix.MatrixRun;
 import hudson.maven.MavenBuild;
 import hudson.model.Fingerprint.BuildPtr;
 import hudson.model.Fingerprint.RangeSet;
@@ -23,6 +25,7 @@ import hudson.util.AdaptedIterator;
 import hudson.util.Iterators;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.export.Exported;
 import org.xml.sax.SAXException;
 
@@ -42,6 +45,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import sun.misc.Request;
+
 /**
  * Base implementation of {@link Run}s that build software.
  *
@@ -123,6 +128,22 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
         return builtOn;
     }
 
+    /**
+     * Used to render the side panel "Back to project" link.
+     *
+     * <p>
+     * In a rare situation where a build can be reached from multiple paths,
+     * returning different URLs from this method based on situations might
+     * be desirable.
+     *
+     * <p>
+     * If you override this method, you'll most likely also want to override
+     * {@link #getDisplayName()}.
+     */
+    public String getUpUrl() {
+        return Functions.getNearestAncestorUrl(Stapler.getCurrentRequest(),getParent())+'/';
+    }
+
     /**
      * List of users who committed a change since the last non-broken build till now.
      *
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
index 89f8780b8f9153e2a968b7946cdb424c841be12e..5a5143f89f4488745ec888cf7f44e11110c6a731 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly
@@ -6,7 +6,7 @@
   <l:side-panel>
     <l:tasks>
       <j:set var="buildUrl" value="${h.decompose(request)}" />
-      <l:task icon="images/24x24/up.gif" href="${h.getNearestAncestorUrl(request,it.parent)}/" title="${%Back to Project}" />
+      <l:task icon="images/24x24/up.gif" href="${it.upUrl}" title="${%Back to Project}" />
       <l:task icon="images/24x24/search.gif" href="${buildUrl.baseUrl}/" title="${%Status}" />
       <l:task icon="images/24x24/notepad.gif" href="${buildUrl.baseUrl}/changes" title="${%Changes}" />
       <j:choose>