Index: wp-admin/about.php
===================================================================
--- wp-admin/about.php	(revision 32419)
+++ wp-admin/about.php	(working copy)
@@ -37,13 +37,35 @@
 		<?php _e( 'Credits' ); ?>
 	</a><a href="freedoms.php" class="nav-tab">
 		<?php _e( 'Freedoms' ); ?>
+	</a><a href="contribute.php" class="nav-tab">
+		<?php _e( 'Contribute' ); ?>
 	</a>
 </h2>
 
+<<<<<<< .mine
+<div class="changelog headline-feature">
+	<h2><?php _e( 'Introducing Twenty&nbsp;Fifteen' ); ?></h2>
+	<div class="featured-image">
+		<img src="//s.w.org/images/core/4.1/theme.png?0" />
+	</div>
+=======
 <div class="headline-feature feature-video">
 	<embed type="application/x-shockwave-flash" src="https://v0.wordpress.com/player.swf?v=1.04" width="1000" height="560" wmode="direct" seamlesstabbing="true" allowfullscreen="true" allowscriptaccess="always" overstretch="true" flashvars="guid=e9kH4FzP&amp;isDynamicSeeking=true"></embed>
 </div>
+>>>>>>> .r32419
 
+<<<<<<< .mine
+	<div class="feature-section">
+		<div class="col">
+			<h3><?php _e( 'Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.' ); ?></h3>
+			<p><?php printf( __( 'Twenty Fifteen has flawless language support, with help from <a href="%s">Google&#8217;s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?></p>
+			<p><?php _e( 'The straightforward typography is readable on any screen size.' ); ?></p>
+			 <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
+		</div>
+		<div class="col">
+			<img class="" src="//s.w.org/images/core/4.1/mobile.png?0" />
+		</div>
+=======
 <hr />
 
 <div class="feature-section two-col">
@@ -55,6 +77,7 @@
 		<p class="pressthis-bookmarklet-demo">
 			<a class="pressthis-bookmarklet" onclick="return false;" href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>"><span><?php _e( 'Press This' ); ?></span></a>
 		</p>
+>>>>>>> .r32419
 	</div>
 
 	<div class="col">
@@ -62,6 +85,21 @@
 	</div>
 </div>
 
+<<<<<<< .mine
+<hr />
+
+<div class="changelog headline-feature dfw">
+	<h2><?php _e( 'Distraction-free writing' ); ?></h2>
+	<div class="feature-section">
+		<div class="dfw-container">
+			<img src="//s.w.org/images/core/4.1/focus.png?0" class="base-image" />
+			<img src="//s.w.org/images/core/4.1/focus1.png?0" class="overlay-image fade-in" />
+			<img src="//s.w.org/images/core/4.1/focus2.png?0" class="overlay-image fade-in" />
+			<img src="//s.w.org/images/core/4.1/focus3.png?0" class="overlay-image from-left" />
+		</div>
+		<h3><em><?php _e( 'Just write.' ); ?></em></h3>
+		<p><?php _e( 'Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>distraction-free writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
+=======
 <div class="feature-section two-col">
 	<div class="col">
 		<img src="//s.w.org/images/core/4.2/unicode.png" />
@@ -73,6 +111,7 @@
 			/* translators: 1: heart emoji, 2: frog face emoji, 3, monkey emoji, 4: pizza emoji, 5: Emoji Codex link */
 			printf( __( 'Don&#8217;t use any of those characters? You can still have fun &mdash; emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other <a href="%5$s">emoji</a>.' ), '&#x1F499', '&#x1F438', '&#x1F412', '&#x1F355', __( 'https://codex.wordpress.org/Emoji' ) );
 		?></p>
+>>>>>>> .r32419
 	</div>
 </div>
 
Index: wp-admin/credits.php
===================================================================
--- wp-admin/credits.php	(revision 32419)
+++ wp-admin/credits.php	(working copy)
@@ -93,6 +93,8 @@
 		<?php _e( 'Credits' ); ?>
 	</a><a href="freedoms.php" class="nav-tab">
 		<?php _e( 'Freedoms' ); ?>
+	</a><a href="contribute.php" class="nav-tab">
+		<?php _e( 'Contribute' ); ?>
 	</a>
 </h2>
 
Index: wp-admin/freedoms.php
===================================================================
--- wp-admin/freedoms.php	(revision 32419)
+++ wp-admin/freedoms.php	(working copy)
@@ -30,6 +30,8 @@
 		<?php _e( 'Credits' ); ?>
 	</a><a href="freedoms.php" class="nav-tab nav-tab-active">
 		<?php _e( 'Freedoms' ); ?>
+	</a><a href="contribute.php" class="nav-tab">
+		<?php _e( 'Contribute' ); ?>
 	</a>
 </h2>
 
Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php	(revision 32419)
+++ wp-includes/comment-template.php	(working copy)
@@ -1423,7 +1423,7 @@
 		);
 
 		$link = sprintf( "<a class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $args['respond_id'],
+			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
 			$onclick,
 			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
 			$args['reply_text']
Index: wp-includes/user.php
===================================================================
--- wp-includes/user.php	(revision 32419)
+++ wp-includes/user.php	(working copy)
@@ -85,6 +85,7 @@
 			$user = new WP_Error('', '');
 		}
 
+		status_header( 403 );
 		return $user;
 	}