Tag 4.9.5

Built from https://develop.svn.wordpress.org/tags/4.9.5@42946 git-svn-id: http://core.svn.wordpress.org/tags/4.9.5@42776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Bump 4.9 branch to version 4.9.5
2018-04-03 22:38:12 +00:00 · 2018-04-03 20:17:40 +00:00 · 2018-04-03 19:51:37 +00:00 · 2018-04-03 16:05:39 +00:00 · 2018-04-03 15:35:41 +00:00 · 2018-04-03 15:22:42 +00:00
213 changed files with 8328 additions and 28733 deletions
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,6 @@
 WordPress - Web publishing software

-Copyright 2011-2017 by the contributors
+Copyright 2011-2018 by the contributors

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
--- a/readme.html
+++ b/readme.html
@@ -58,7 +58,7 @@

 <h3>Recommendations</h3>
 <ul>
-	<li><a href="https://secure.php.net/">PHP</a> version <strong>7</strong> or higher.</li>
+	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.2</strong> or higher.</li>
 	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</li>
 	<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -110,7 +110,7 @@ get_header( 'wp-activate' );
 					printf(
 						/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
 						__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-						sprintf( '<a href="http://%s">%s</a>', $signup->domain ),
+						sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
 						$signup->user_login,
 						$signup->user_email,
 						wp_lostpassword_url()
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -30,6 +30,100 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 		</h2>

+		<div class="changelog point-releases">
+			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						28
+					),
+					'4.9.5',
+					number_format_i18n( 28 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.5' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed %2$s bugs.',
+						1
+					),
+					'4.9.4',
+					number_format_i18n( 1 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.4' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed %2$s bugs.',
+						34
+					),
+					'4.9.3',
+					number_format_i18n( 34 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.3' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						22
+					),
+					'4.9.2',
+					number_format_i18n( 22 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.2' );
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_n(
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+						11
+					),
+					'4.9.1',
+					number_format_i18n( 11 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.1' );
+				?>
+			</p>
+		</div>
+
 		<div class="feature-section one-col">
 			<div class="col">
 				<h2>
@@ -53,7 +147,9 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 		</div>

 		<div class="floating-header-section">
-			<h2><?php _e( 'Customizer Workflow Improved' ); ?></h2>
+			<div class="section-header">
+				<h2><?php _e( 'Customizer Workflow Improved' ); ?></h2>
+			</div>

 			<div class="section-content">
 				<div class="section-item">
@@ -88,7 +184,9 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 		</div>

 		<div class="floating-header-section">
-			<h2><?php _e( 'Coding Enhancements' ); ?></h2>
+			<div class="section-header">
+				<h2><?php _e( 'Coding Enhancements' ); ?></h2>
+			</div>

 			<div class="section-content">
 				<div class="section-item">
@@ -116,7 +214,9 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 		</div>

 		<div class="floating-header-section">
-			<h2><?php _e( 'Even More Widget Updates' ); ?></h2>
+			<div class="section-header">
+				<h2><?php _e( 'Even More Widget Updates' ); ?></h2>
+			</div>

 			<div class="section-content">
 				<div class="section-item">
@@ -137,7 +237,9 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 		</div>

 		<div class="floating-header-section">
-			<h2><?php _e( 'Site Building Improvements' ); ?></h2>
+			<div class="section-header">
+				<h2><?php _e( 'Site Building Improvements' ); ?></h2>
+			</div>

 			<div class="section-content">
 				<div class="section-item">
@@ -211,7 +313,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 					<p><?php _e( 'WordPress 4.9 includes an upgraded version of MediaElement.js, which removes dependencies on jQuery, improves accessibility, modernizes the UI, and fixes many bugs.' ); ?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2017/10/15/improvements-for-roles-and-capabilities-in-4-9/"><?php _e( 'Roles and Capability Improvements' ); ?></a></h3>
+					<h3><a href="https://make.wordpress.org/core/2017/10/15/improvements-for-roles-and-capabilities-in-4-9/"><?php _e( 'Improvements to Roles and Capabilities' ); ?></a></h3>
 					<p><?php _e( 'New capabilities have been introduced that allow granular management of plugins and translation files. In addition, the site switching process in multisite has been fine-tuned to update the available roles and capabilities in a more reliable and coherent way.' ); ?></p>
 				</div>
 			</div>
@@ -242,34 +344,78 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 					offset += $adminbar.height();
 				}

-				var adjustScrollClass = _.throttle( function adjustScrollClass() {
+				function setup() {
+					$sections.each( function( i, section ) {
+						var $section = $( section );
+						// If the title is long, switch the layout
+						var $title = $section.find( 'h2' );
+						if ( $title.innerWidth() > 300 ) {
+							$section.addClass( 'has-long-title' );
+						}
+					} );
+				}
+
+				var adjustScrollPosition = _.throttle( function adjustScrollPosition() {
 					$sections.each( function( i, section ) {
 						var $section = $( section );
 						var $header = $section.find( 'h2' );
 						var width = $header.innerWidth();
+						var height = $header.innerHeight();
+
+						if ( $section.hasClass( 'has-long-title' ) ) {
+							return;
+						}

 						var sectionStart = $section.offset().top - offset;
-						var sectionEnd = sectionStart + $section.innerHeight() - 60;
+						var sectionEnd = sectionStart + $section.innerHeight();
+						var scrollPos = $window.scrollTop();

 						// If we're scrolled into a section, stick the header
-						if ( $window.scrollTop() >= sectionStart && $window.scrollTop() < sectionEnd ) {
-							$header.addClass( 'header-fixed' );
-							$header.css( { top: offset + 'px', width: width + 'px' } );
+						if ( scrollPos >= sectionStart && scrollPos < sectionEnd - height ) {
+							$header.css( {
+								position: 'fixed',
+								top: offset + 'px',
+								bottom: 'auto',
+								width: width + 'px'
+							} );
+						// If we're at the end of the section, stick the header to the bottom
+						} else if ( scrollPos >= sectionEnd - height && scrollPos < sectionEnd ) {
+							$header.css( {
+								position: 'absolute',
+								top: 'auto',
+								bottom: 0,
+								width: width + 'px'
+							} );
+						// Unstick the header
 						} else {
-							$header.removeClass( 'header-fixed' );
-							$header.css( { top: 0, width: 'auto' } );
+							$header.css( {
+								position: 'static',
+								top: 'auto',
+								bottom: 'auto',
+								width: 'auto'
+							} );
 						}
 					} );
 				}, 100 );
+
 				function enableFixedHeaders() {
 					if ( $window.width() > 782 ) {
-						adjustScrollClass();
-						$window.on( 'scroll', adjustScrollClass );
+						setup();
+						adjustScrollPosition();
+						$window.on( 'scroll', adjustScrollPosition );
 					} else {
-						$window.off( 'scroll', adjustScrollClass );
+						$window.off( 'scroll', adjustScrollPosition );
+						$sections.find( '.section-header' )
+							.css( {
+								width: 'auto'
+							} );
 						$sections.find( 'h2' )
-							.removeClass( 'header-fixed' )
-							.css( { top: 0, width: 'auto' } );
+							.css( {
+								position: 'static',
+								top: 'auto',
+								bottom: 'auto',
+								width: 'auto'
+							} );
 					}
 				}
 				$( window ).resize( enableFixedHeaders );
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -20,7 +20,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s adds more ways for you to express yourself and represent your brand.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s will smooth your design workflow and keep you safe from coding errors.' ), $display_version ); ?></p>

 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

--- a/wp-admin/css/about-rtl.css
+++ b/wp-admin/css/about-rtl.css
@@ -172,8 +172,6 @@
 	display: flex;
 	-webkit-box-pack: justify;
 	justify-content: space-between;
-	-webkit-box-align: center;
-	align-items: center;
 	flex-wrap: wrap;
 }

@@ -357,37 +355,87 @@
 /* 2.3 Floating Header Layout */

 .about-wrap .floating-header-section {
+	display: -ms-grid;
 	display: grid;
 	grid-gap: 0 60px;
+	-ms-grid-columns: 5fr 11fr;
 	grid-template-columns: 5fr 11fr;
 	max-width: 1020px;
 	margin: 0 auto 120px;
 }

-.about-wrap .floating-header-section h2 {
+.about-wrap .floating-header-section .section-header {
+	-ms-grid-column: 1;
 	grid-column: 1;
-	text-align: right;
-	margin: 0;
+	position: relative;
+	min-width: 230px;
+	max-width: 300px;
 }

-.about-wrap .floating-header-section .header-fixed {
-	position: fixed;
-	width: 300px;
+.about-wrap .floating-header-section h2 {
+	margin: 0;
+	text-align: right;
+	position: absolute;
 }

 .about-wrap .floating-header-section .section-content {
-	display: grid;
-	grid-gap: 60px;
-	grid-template-columns: 5fr 5fr;
+	-ms-grid-column: 2;
 	grid-column: 2;
+	display: -webkit-box;
+	display: flex;
+	-webkit-box-pack: justify;
+	justify-content: space-between;
+	-webkit-box-align: start;
+	align-items: flex-start;
+	-webkit-box-orient: horizontal;
+	-webkit-box-direction: normal;
+	flex-flow: row wrap;
+	-webkit-box-flex: 2;
+	flex-grow: 2;
+	flex-shrink: 0;
 }

-.about-wrap .floating-header-section .section-item:nth-of-type(odd) {
-	grid-column: 1;
+.about-wrap .floating-header-section .section-item {
+	-webkit-box-flex: 1;
+	flex-grow: 1;
+	max-width: calc(50% - 30px);
 }

-.about-wrap .floating-header-section .section-item:nth-of-type(even) {
-	grid-column: 2;
+.about-wrap .floating-header-section .section-item:nth-child(1),
+.about-wrap .floating-header-section .section-item:nth-child(2) {
+	margin-bottom: 60px;
+}
+
+.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2),
+.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1) {
+	margin-bottom: 0;
+}
+
+.about-wrap .floating-header-section.has-long-title {
+	display: block;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-header {
+	max-width: 100%;
+}
+
+.about-wrap .floating-header-section.has-long-title h2 {
+	position: static;
+	margin-bottom: 60px;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-content {
+	-webkit-box-pack: start;
+	justify-content: flex-start;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-item {
+	max-width: 300px;
+	margin-bottom: 0;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-item + .section-item {
+	margin-right: 60px;
 }

 /*------------------------------------------------------------------------------
@@ -409,7 +457,7 @@
 }

 .about-wrap .compact {
-	margin-bottom: 0
+	margin-bottom: 0;
 }

 .about-wrap .wp-person {
@@ -481,7 +529,24 @@
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 1250px) {
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
+		margin: 0 0 60px;
+	}
+
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
+		margin: 0;
+	}
+
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
+		margin-right: 60px;
+	}
+}
+
+@media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		-webkit-column-count: 1;
 		column-count: 1;
@@ -498,13 +563,17 @@
 	}

 	.about-wrap .floating-header-section {
-		grid-template-columns: 1fr;
-		grid-gap: 60px 0;
+		display: block;
 	}

-	.about-wrap .floating-header-section h2,
+	.about-wrap .floating-header-section .section-header,
 	.about-wrap .floating-header-section .section-content {
-		grid-column: 1;
+		max-width: 100%;
+	}
+
+	.about-wrap .floating-header-section h2 {
+		position: static;
+		margin-bottom: 60px;
 	}
 }

@@ -560,12 +629,15 @@
 		margin-bottom: 60px;
 	}

-	.about-wrap .floating-header-section .section-content {
-		grid-template-columns: 1fr;
-		grid-gap: 60px 0;
+	.about-wrap .floating-header-section h2 {
+		word-break: break-all;
+		-webkit-hyphens: auto;
+		-ms-hyphens: auto;
+		hyphens: auto;
 	}

 	.about-wrap .floating-header-section .section-content .section-item {
-		grid-column: 1;
+		max-width: 100%;
+		margin: 0 0 60px;
 	}
 }
--- a/wp-admin/css/about-rtl.min.css
+++ b/wp-admin/css/about-rtl.min.css
--- a/wp-admin/css/about.css
+++ b/wp-admin/css/about.css
@@ -172,8 +172,6 @@
 	display: flex;
 	-webkit-box-pack: justify;
 	justify-content: space-between;
-	-webkit-box-align: center;
-	align-items: center;
 	flex-wrap: wrap;
 }

@@ -357,37 +355,87 @@
 /* 2.3 Floating Header Layout */

 .about-wrap .floating-header-section {
+	display: -ms-grid;
 	display: grid;
 	grid-gap: 0 60px;
+	-ms-grid-columns: 5fr 11fr;
 	grid-template-columns: 5fr 11fr;
 	max-width: 1020px;
 	margin: 0 auto 120px;
 }

-.about-wrap .floating-header-section h2 {
+.about-wrap .floating-header-section .section-header {
+	-ms-grid-column: 1;
 	grid-column: 1;
-	text-align: left;
-	margin: 0;
+	position: relative;
+	min-width: 230px;
+	max-width: 300px;
 }

-.about-wrap .floating-header-section .header-fixed {
-	position: fixed;
-	width: 300px;
+.about-wrap .floating-header-section h2 {
+	margin: 0;
+	text-align: left;
+	position: absolute;
 }

 .about-wrap .floating-header-section .section-content {
-	display: grid;
-	grid-gap: 60px;
-	grid-template-columns: 5fr 5fr;
+	-ms-grid-column: 2;
 	grid-column: 2;
+	display: -webkit-box;
+	display: flex;
+	-webkit-box-pack: justify;
+	justify-content: space-between;
+	-webkit-box-align: start;
+	align-items: flex-start;
+	-webkit-box-orient: horizontal;
+	-webkit-box-direction: normal;
+	flex-flow: row wrap;
+	-webkit-box-flex: 2;
+	flex-grow: 2;
+	flex-shrink: 0;
 }

-.about-wrap .floating-header-section .section-item:nth-of-type(odd) {
-	grid-column: 1;
+.about-wrap .floating-header-section .section-item {
+	-webkit-box-flex: 1;
+	flex-grow: 1;
+	max-width: calc(50% - 30px);
 }

-.about-wrap .floating-header-section .section-item:nth-of-type(even) {
-	grid-column: 2;
+.about-wrap .floating-header-section .section-item:nth-child(1),
+.about-wrap .floating-header-section .section-item:nth-child(2) {
+	margin-bottom: 60px;
+}
+
+.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2),
+.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1) {
+	margin-bottom: 0;
+}
+
+.about-wrap .floating-header-section.has-long-title {
+	display: block;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-header {
+	max-width: 100%;
+}
+
+.about-wrap .floating-header-section.has-long-title h2 {
+	position: static;
+	margin-bottom: 60px;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-content {
+	-webkit-box-pack: start;
+	justify-content: flex-start;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-item {
+	max-width: 300px;
+	margin-bottom: 0;
+}
+
+.about-wrap .floating-header-section.has-long-title .section-item + .section-item {
+	margin-left: 60px;
 }

 /*------------------------------------------------------------------------------
@@ -409,7 +457,7 @@
 }

 .about-wrap .compact {
-	margin-bottom: 0
+	margin-bottom: 0;
 }

 .about-wrap .wp-person {
@@ -481,7 +529,24 @@
  4.0 - Media Queries
 ------------------------------------------------------------------------------*/

-@media screen and ( max-width: 782px ) {
+@media screen and (max-width: 1250px) {
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
+		margin: 0 0 60px;
+	}
+
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
+		margin: 0;
+	}
+
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
+	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
+		margin-left: 60px;
+	}
+}
+
+@media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		-webkit-column-count: 1;
 		column-count: 1;
@@ -498,13 +563,17 @@
 	}

 	.about-wrap .floating-header-section {
-		grid-template-columns: 1fr;
-		grid-gap: 60px 0;
+		display: block;
 	}

-	.about-wrap .floating-header-section h2,
+	.about-wrap .floating-header-section .section-header,
 	.about-wrap .floating-header-section .section-content {
-		grid-column: 1;
+		max-width: 100%;
+	}
+
+	.about-wrap .floating-header-section h2 {
+		position: static;
+		margin-bottom: 60px;
 	}
 }

@@ -560,12 +629,15 @@
 		margin-bottom: 60px;
 	}

-	.about-wrap .floating-header-section .section-content {
-		grid-template-columns: 1fr;
-		grid-gap: 60px 0;
+	.about-wrap .floating-header-section h2 {
+		word-break: break-all;
+		-webkit-hyphens: auto;
+		-ms-hyphens: auto;
+		hyphens: auto;
 	}

 	.about-wrap .floating-header-section .section-content .section-item {
-		grid-column: 1;
+		max-width: 100%;
+		margin: 0 0 60px;
 	}
 }
--- a/wp-admin/css/about.min.css
+++ b/wp-admin/css/about.min.css
--- a/wp-admin/css/colors/light/colors-rtl.min.css
+++ b/wp-admin/css/colors/light/colors-rtl.min.css
--- a/wp-admin/css/colors/light/colors.min.css
+++ b/wp-admin/css/colors/light/colors.min.css
--- a/wp-admin/css/common-rtl.css
+++ b/wp-admin/css/common-rtl.css
@@ -860,7 +860,7 @@ hr {
 #media-items a.delete,
 #media-items a.delete-permanently,
 #nav-menu-footer .menu-delete,
-#delete-link a.delete  {
+#delete-link a.delete {
 	color: #a00;
 }

@@ -1188,11 +1188,19 @@ th.action-links {

 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	display: inline-block;
-	margin: 7px 0 7px 4px;
 	line-height: 16px;
 }

+.filter-drawer .filter-group-feature input {
+	position: absolute;
+	margin: 0;
+}
+
+.filter-group .filter-group-feature label {
+	display: block;
+	margin: 14px 23px 14px 0px;
+}
+
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -1700,7 +1708,7 @@ form.upgrade .hint {

 .toggle-arrow {
 	background-repeat: no-repeat;
-	background-position: top left;
+	background-position: top right;
 	background-color: transparent;
 	height: 22px;
 	line-height: 22px;
@@ -1708,7 +1716,7 @@ form.upgrade .hint {
 }

 .toggle-arrow-active {
-	background-position: bottom left;
+	background-position: bottom right;
 }

 #screen-options-wrap h5, /* Back-compat for old plugins */
@@ -3042,6 +3050,7 @@ img {
 	min-height: 60vh;
 	height: calc( 100vh - 295px );
 	border: 1px solid #ddd;
+	box-sizing: border-box;
 }

 #templateside > h2 {
@@ -3060,8 +3069,8 @@ img {
 	margin-top: 0;
 	overflow: auto;
 	padding: 0;
-	min-height: calc(60vh + 2px);
-	height: calc(100vh - 293px);
+	min-height: 60vh;
+	height: calc(100vh - 295px);
 	background-color: #f7f7f7;
 	border: 1px solid #ddd;
 	border-right: none;
@@ -3240,17 +3249,21 @@ img {
 	margin: 4px 0;
 }

-#templateside li a,
+#templateside li:not(.howto) a,
 .theme-editor-php .highlight {
 	display: block;
 	padding: 3px 12px 3px 0;
 	text-decoration: none;
 }

-#templateside li > a:first-of-type {
+#templateside li:not(.howto) > a:first-of-type {
 	padding-top: 0;
 }

+#templateside li.howto {
+	padding: 6px 12px 12px 12px;
+}
+
 .theme-editor-php .highlight {
 	margin: -3px -12px -3px 3px;
 }
@@ -3756,17 +3769,17 @@ img {
 	}

 	/* Theme/Plugin File Editor */
-	
-	#template textarea, 
+
+	#template textarea,
 	#template .CodeMirror {
 		box-sizing: border-box;
 	}
-	
+
 	#templateside {
 		float: none;
 		width: auto;
 	}
-	
+
 	#templateside > ul {
 		border-right: 1px solid #ddd;
 	}
@@ -3775,10 +3788,13 @@ img {
 		margin: 0;
 	}

-	#templateside li a {
+	#templateside li:not(.howto) a {
 		display: block;
 		padding: 5px;
 	}
+	#templateside li.howto {
+		padding: 12px;
+	}

 	#templateside .highlight {
 		padding: 5px;
@@ -3834,31 +3850,31 @@ img {
 		width: 100%;
 		text-align: right;
 	}
-	
+
 	.fileedit-sub .alignright label {
 		display: block;
 	}
-	
-	.fileedit-sub #theme, 
+
+	.fileedit-sub #theme,
 	.fileedit-sub #plugin {
 		margin-right: 0;
-	    max-width: 70%;
+		max-width: 70%;
 	}
-	
+
 	.fileedit-sub input[type="submit"] {
 		margin-bottom: 0px;
 		padding: 8px 18px;
 	}
-	
+
 	#documentation label[for="docs-list"] {
 		display: block;
 	}
-	
+
 	#documentation select[name="docs-list"] {
 		margin-right: 0;
 		max-width: 60%;
 	}
-	
+
 	#documentation input[type="button"] {
 		margin-bottom: 0;
 		padding: 8px 18px;
@@ -3881,6 +3897,10 @@ img {
 		line-height: 25px;
 	}

+	.filter-drawer .filter-group-feature label {
+		margin-right: 32px;
+	}
+
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;
@@ -3923,23 +3943,6 @@ img {
 	}
 }

-.options-media-php br {
-	display: none;
-}
-
-@media screen and (max-width: 375px) {
-	.options-media-php input[type="number"][name*="_size_"] {
-		margin: 5px 0;
-	}
-	.options-media-php label[for*="_size_h"]:before {
-		content: '';
-		display: block;
-	}
-	.options-media-php br {
-		display: block;
-	}
-}
-
@media screen and (max-width: 320px) {
 	/* Prevent default center alignment and larger font for the Right Now widget when
 	   the network dashboard is viewed on a small mobile device. */
--- a/wp-admin/css/common-rtl.min.css
+++ b/wp-admin/css/common-rtl.min.css
--- a/wp-admin/css/common.css
+++ b/wp-admin/css/common.css
@@ -860,7 +860,7 @@ hr {
 #media-items a.delete,
 #media-items a.delete-permanently,
 #nav-menu-footer .menu-delete,
-#delete-link a.delete  {
+#delete-link a.delete {
 	color: #a00;
 }

@@ -1188,11 +1188,19 @@ th.action-links {

 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	display: inline-block;
-	margin: 7px 4px 7px 0;
 	line-height: 16px;
 }

+.filter-drawer .filter-group-feature input {
+	position: absolute;
+	margin: 0;
+}
+
+.filter-group .filter-group-feature label {
+	display: block;
+	margin: 14px 0px 14px 23px;
+}
+
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -3042,6 +3050,7 @@ img {
 	min-height: 60vh;
 	height: calc( 100vh - 295px );
 	border: 1px solid #ddd;
+	box-sizing: border-box;
 }

 #templateside > h2 {
@@ -3060,8 +3069,8 @@ img {
 	margin-top: 0;
 	overflow: auto;
 	padding: 0;
-	min-height: calc(60vh + 2px);
-	height: calc(100vh - 293px);
+	min-height: 60vh;
+	height: calc(100vh - 295px);
 	background-color: #f7f7f7;
 	border: 1px solid #ddd;
 	border-left: none;
@@ -3240,17 +3249,21 @@ img {
 	margin: 4px 0;
 }

-#templateside li a,
+#templateside li:not(.howto) a,
 .theme-editor-php .highlight {
 	display: block;
 	padding: 3px 0 3px 12px;
 	text-decoration: none;
 }

-#templateside li > a:first-of-type {
+#templateside li:not(.howto) > a:first-of-type {
 	padding-top: 0;
 }

+#templateside li.howto {
+	padding: 6px 12px 12px 12px;
+}
+
 .theme-editor-php .highlight {
 	margin: -3px 3px -3px -12px;
 }
@@ -3756,17 +3769,17 @@ img {
 	}

 	/* Theme/Plugin File Editor */
-	
-	#template textarea, 
+
+	#template textarea,
 	#template .CodeMirror {
 		box-sizing: border-box;
 	}
-	
+
 	#templateside {
 		float: none;
 		width: auto;
 	}
-	
+
 	#templateside > ul {
 		border-left: 1px solid #ddd;
 	}
@@ -3775,10 +3788,13 @@ img {
 		margin: 0;
 	}

-	#templateside li a {
+	#templateside li:not(.howto) a {
 		display: block;
 		padding: 5px;
 	}
+	#templateside li.howto {
+		padding: 12px;
+	}

 	#templateside .highlight {
 		padding: 5px;
@@ -3834,31 +3850,31 @@ img {
 		width: 100%;
 		text-align: left;
 	}
-	
+
 	.fileedit-sub .alignright label {
 		display: block;
 	}
-	
-	.fileedit-sub #theme, 
+
+	.fileedit-sub #theme,
 	.fileedit-sub #plugin {
 		margin-left: 0;
-	    max-width: 70%;
+		max-width: 70%;
 	}
-	
+
 	.fileedit-sub input[type="submit"] {
 		margin-bottom: 0px;
 		padding: 8px 18px;
 	}
-	
+
 	#documentation label[for="docs-list"] {
 		display: block;
 	}
-	
+
 	#documentation select[name="docs-list"] {
 		margin-left: 0;
 		max-width: 60%;
 	}
-	
+
 	#documentation input[type="button"] {
 		margin-bottom: 0;
 		padding: 8px 18px;
@@ -3881,6 +3897,10 @@ img {
 		line-height: 25px;
 	}

+	.filter-drawer .filter-group-feature label {
+		margin-left: 32px;
+	}
+
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;
@@ -3923,23 +3943,6 @@ img {
 	}
 }

-.options-media-php br {
-	display: none;
-}
-
-@media screen and (max-width: 375px) {
-	.options-media-php input[type="number"][name*="_size_"] {
-		margin: 5px 0;
-	}
-	.options-media-php label[for*="_size_h"]:before {
-		content: '';
-		display: block;
-	}
-	.options-media-php br {
-		display: block;
-	}
-}
-
@media screen and (max-width: 320px) {
 	/* Prevent default center alignment and larger font for the Right Now widget when
 	   the network dashboard is viewed on a small mobile device. */
--- a/wp-admin/css/common.min.css
+++ b/wp-admin/css/common.min.css
--- a/wp-admin/css/customize-controls-rtl.css
+++ b/wp-admin/css/customize-controls-rtl.css
@@ -2706,6 +2706,7 @@ body.adding-widget .add-new-widget:before,
 }

 #available-menu-items-search .search-icon:after,
+#available-widgets-filter .search-icon:after,
 .themes-filter-bar .search-icon:after {
 	content: "\f179";
 	font: normal 20px/1 dashicons;
--- a/wp-admin/css/customize-controls-rtl.min.css
+++ b/wp-admin/css/customize-controls-rtl.min.css
--- a/wp-admin/css/customize-controls.css
+++ b/wp-admin/css/customize-controls.css
@@ -2706,6 +2706,7 @@ body.adding-widget .add-new-widget:before,
 }

 #available-menu-items-search .search-icon:after,
+#available-widgets-filter .search-icon:after,
 .themes-filter-bar .search-icon:after {
 	content: "\f179";
 	font: normal 20px/1 dashicons;
--- a/wp-admin/css/customize-controls.min.css
+++ b/wp-admin/css/customize-controls.min.css
--- a/wp-admin/css/customize-nav-menus-rtl.css
+++ b/wp-admin/css/customize-nav-menus-rtl.css
@@ -216,6 +216,10 @@
 	padding-top: 12px;
 }

+.menu-location-settings .customize-control-checkbox .theme-location-set {
+	line-height: 1;
+}
+
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }
--- a/wp-admin/css/customize-nav-menus-rtl.min.css
+++ b/wp-admin/css/customize-nav-menus-rtl.min.css
--- a/wp-admin/css/customize-nav-menus.css
+++ b/wp-admin/css/customize-nav-menus.css
@@ -216,6 +216,10 @@
 	padding-top: 12px;
 }

+.menu-location-settings .customize-control-checkbox .theme-location-set {
+	line-height: 1;
+}
+
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }
--- a/wp-admin/css/customize-nav-menus.min.css
+++ b/wp-admin/css/customize-nav-menus.min.css
--- a/wp-admin/css/edit-rtl.css
+++ b/wp-admin/css/edit-rtl.css
@@ -330,7 +330,7 @@ form#tags-filter {
 }

 #content-resize-handle {
-	background: transparent url(../images/resize.gif) no-repeat scroll right bottom;
+	background: transparent url(../images/resize.gif) no-repeat scroll left bottom;
 	width: 12px;
 	cursor: row-resize;
 }
@@ -1299,7 +1299,7 @@ table.links-table {
  (min-resolution: 120dpi) {
 	#content-resize-handle,
 	#post-body .wp_themeSkin .mceStatusbar a.mceResize {
-		background: transparent url(../images/resize-2x.gif) no-repeat scroll right bottom;
+		background: transparent url(../images/resize-2x.gif) no-repeat scroll left bottom;
 		background-size: 11px 11px;
 	}

--- a/wp-admin/css/edit-rtl.min.css
+++ b/wp-admin/css/edit-rtl.min.css
--- a/wp-admin/css/forms-rtl.css
+++ b/wp-admin/css/forms-rtl.css
@@ -438,7 +438,15 @@ fieldset label,
 	vertical-align: middle;
 }

-.options-media-php label[for*="_size_"],
+.options-media-php [for*="_size_"] {
+	min-width: 10em;
+	vertical-align: baseline;
+}
+
+.options-media-php .small-text[name*="_size_"] {
+	margin: 0 0 1em;
+}
+
 #misc-publishing-actions label {
 	vertical-align: baseline;
 }
@@ -897,7 +905,7 @@ table.form-table td .updated p {

 .options-general-php .spinner {
 	float: none;
-	margin: 0 3px;
+	margin: -3px 3px 0;
 }

 .settings-php .language-install-spinner,
--- a/wp-admin/css/forms-rtl.min.css
+++ b/wp-admin/css/forms-rtl.min.css
--- a/wp-admin/css/forms.css
+++ b/wp-admin/css/forms.css
@@ -438,7 +438,15 @@ fieldset label,
 	vertical-align: middle;
 }

-.options-media-php label[for*="_size_"],
+.options-media-php [for*="_size_"] {
+	min-width: 10em;
+	vertical-align: baseline;
+}
+
+.options-media-php .small-text[name*="_size_"] {
+	margin: 0 0 1em;
+}
+
 #misc-publishing-actions label {
 	vertical-align: baseline;
 }
@@ -897,7 +905,7 @@ table.form-table td .updated p {

 .options-general-php .spinner {
 	float: none;
-	margin: 0 3px;
+	margin: -3px 3px 0;
 }

 .settings-php .language-install-spinner,
--- a/wp-admin/css/forms.min.css
+++ b/wp-admin/css/forms.min.css
--- a/wp-admin/css/login-rtl.min.css
+++ b/wp-admin/css/login-rtl.min.css
--- a/wp-admin/css/login.min.css
+++ b/wp-admin/css/login.min.css
--- a/wp-admin/css/nav-menus-rtl.css
+++ b/wp-admin/css/nav-menus-rtl.css
@@ -785,7 +785,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
 }

@media screen and ( max-width: 782px ) {
-	body.nav-menus-php {
+	body.nav-menus-php,
+	body.wp-customizer {
 		min-width: 0 !important;
 	}

--- a/wp-admin/css/nav-menus-rtl.min.css
+++ b/wp-admin/css/nav-menus-rtl.min.css
--- a/wp-admin/css/nav-menus.css
+++ b/wp-admin/css/nav-menus.css
@@ -785,7 +785,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
 }

@media screen and ( max-width: 782px ) {
-	body.nav-menus-php {
+	body.nav-menus-php,
+	body.wp-customizer {
 		min-width: 0 !important;
 	}

--- a/wp-admin/css/nav-menus.min.css
+++ b/wp-admin/css/nav-menus.min.css
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -154,7 +154,8 @@
 	top: 30px;
 }

-.media-frame #embed-url-field.invalid {
+.media-frame #embed-url-field.invalid,
+.media-widget-image-link > .link:invalid {
 	border: 1px solid #dc3232;
 }

@@ -176,9 +177,7 @@
 	cursor: pointer;
 }

-.media-widget-preview.media_image,
-.media-widget-preview.media_audio,
-.attachment-media-view {
+.media-widget-preview .placeholder {
 	background: #f1f1f1;
 }

@@ -189,7 +188,7 @@
 	background: transparent;
 }

-.media-widget-gallery-preview .gallery-item .gallery-icon { 
+.media-widget-gallery-preview .gallery-item .gallery-icon {
 	margin: 4.5%;
 }

--- a/wp-admin/css/widgets-rtl.min.css
+++ b/wp-admin/css/widgets-rtl.min.css
--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
@@ -154,7 +154,8 @@
 	top: 30px;
 }

-.media-frame #embed-url-field.invalid {
+.media-frame #embed-url-field.invalid,
+.media-widget-image-link > .link:invalid {
 	border: 1px solid #dc3232;
 }

@@ -176,9 +177,7 @@
 	cursor: pointer;
 }

-.media-widget-preview.media_image,
-.media-widget-preview.media_audio,
-.attachment-media-view {
+.media-widget-preview .placeholder {
 	background: #f1f1f1;
 }

@@ -189,7 +188,7 @@
 	background: transparent;
 }

-.media-widget-gallery-preview .gallery-item .gallery-icon { 
+.media-widget-gallery-preview .gallery-item .gallery-icon {
 	margin: 4.5%;
 }

--- a/wp-admin/css/widgets.min.css
+++ b/wp-admin/css/widgets.min.css
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -719,7 +719,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
 				403
 			);
@@ -877,7 +877,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>

 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
 				403
 			);
@@ -885,7 +885,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>

 		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
 				403
 			);
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -14,7 +14,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' );

 if ( ! current_user_can( 'customize' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
 		403
 	);
@@ -31,7 +31,7 @@ if ( $wp_customize->changeset_post_id() ) {

 	if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post->ID ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '</p>',
 			403
 		);
@@ -42,18 +42,42 @@ if ( $wp_customize->changeset_post_id() ) {
 		get_post_time( 'G', true, $changeset_post ) < time()
 	);
 	if ( $missed_schedule ) {
-		wp_publish_post( $changeset_post->ID );
+		/*
+		 * Note that an Ajax request spawns here instead of just calling `wp_publish_post( $changeset_post->ID )`.
+		 *
+		 * Because WP_Customize_Manager is not instantiated for customize.php with the `settings_previewed=false`
+		 * argument, settings cannot be reliably saved. Some logic short-circuits if the current value is the
+		 * same as the value being saved. This is particularly true for options via `update_option()`.
+		 *
+		 * By opening an Ajax request, this is avoided and the changeset is published. See #39221.
+		 */
+		$nonces = $wp_customize->get_nonces();
+		$request_args = array(
+			'nonce' => $nonces['save'],
+			'customize_changeset_uuid' => $wp_customize->changeset_uuid(),
+			'wp_customize' => 'on',
+			'customize_changeset_status' => 'publish',
+		);
+		ob_start();
+		?>
+		<?php wp_print_scripts( array( 'wp-util' ) ); ?>
+		<script>
+			wp.ajax.post( 'customize_save', <?php echo wp_json_encode( $request_args ); ?> );
+		</script>
+		<?php
+		$script = ob_get_clean();
+
 		wp_die(
 			'<h1>' . __( 'Your scheduled changes just published' ) . '</h1>' .
-			'<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
+			'<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>' . $script,
 			200
 		);
 	}

 	if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'This changeset has already been published and cannot be further modified.' ) . '</p>' .
+			'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
+			'<p>' . __( 'This changeset cannot be further modified.' ) . '</p>' .
 			'<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
 			403
 		);
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -10,7 +10,7 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 if ( ! current_user_can( 'edit_posts' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
 		403
 	);
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -639,7 +639,7 @@ if ( post_type_supports($post_type, 'editor') ) {
 		'resize' => false,
 		'wp_autoresize_on' => $_wp_editor_expand,
 		'add_unload_trigger' => false,
-		'wp_keep_scroll_position' => true,
+		'wp_keep_scroll_position' => ! $is_IE,
 	),
 ) ); ?>
 <table id="post-status-info"><tbody><tr>
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -23,7 +23,7 @@ if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {

 if ( ! current_user_can( $tax->cap->manage_terms ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
 		403
 	);
@@ -72,7 +72,7 @@ case 'add-tag':

 	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
 			403
 		);
@@ -96,7 +96,7 @@ case 'delete':

 	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
 			403
 		);
@@ -116,7 +116,7 @@ case 'bulk-delete':

 	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
 			403
 		);
@@ -152,7 +152,7 @@ case 'editedtag':

 	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
 			403
 		);
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -36,7 +36,7 @@ if ( ! $post_type_object )

 if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
 		403
 	);
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -19,7 +19,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s adds more ways for you to express yourself and represent your brand.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s will smooth your design workflow and keep you safe from coding errors.' ), $display_version ); ?></p>

 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -28,7 +28,7 @@ function add_link() {
 function edit_link( $link_id = 0 ) {
 	if ( ! current_user_can( 'manage_links' ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
 			403
 		);
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -255,6 +255,10 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	public function column_name( $user ) {
 		if ( $user->first_name && $user->last_name ) {
 			echo "$user->first_name $user->last_name";
+		} elseif ( $user->first_name ) {
+			echo $user->first_name;
+		} elseif ( $user->last_name ) {
+			echo $user->last_name;
 		} else {
 			echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 		}
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -342,7 +342,8 @@ class WP_Upgrader {
 			if ( ! empty( $details['files'] ) ) {
 				$children = $this->flatten_dirlist( $details['files'], $path . $name . '/' );

-				$files = array_merge( $files, $children );
+				// Merge keeping possible numeric keys, which array_merge() will reindex from 0..n
+				$files = $files + $children;
 			}
 		}

--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -488,6 +488,10 @@ class WP_Users_List_Table extends WP_List_Table {
 					case 'name':
 						if ( $user_object->first_name && $user_object->last_name ) {
 							$r .= "$user_object->first_name $user_object->last_name";
+						} elseif ( $user_object->first_name ) {
+							$r .= $user_object->first_name;
+						} elseif ( $user_object->last_name ) {
+							$r .= $user_object->last_name;
 						} else {
 							$r .= '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 						}
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -1567,14 +1567,14 @@ function wp_welcome_panel() {
 	<p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
 	<div class="welcome-panel-column-container">
 	<div class="welcome-panel-column">
-		<?php if ( current_user_can( 'customize' ) ):
-			$customize_themes_link = add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ); ?>
+		<?php if ( current_user_can( 'customize' ) ) : ?>
 			<h3><?php _e( 'Get Started' ); ?></h3>
 			<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
 		<?php endif; ?>
 		<a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
 		<?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
-			<p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), $customize_themes_link ); ?></p>
+			<?php $themes_link = current_user_can( 'customize' ) ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
+			<p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), $themes_link ); ?></p>
 		<?php endif; ?>
 	</div>
 	<div class="welcome-panel-column">
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -445,7 +445,8 @@ function wp_edit_theme_plugin_file( $args ) {
 			}
 		}

-		if ( 0 !== validate_file( $real_file, $allowed_files ) ) {
+		// Compare based on relative paths
+		if ( 0 !== validate_file( $file, array_keys( $allowed_files ) ) ) {
 			return new WP_Error( 'disallowed_theme_file', __( 'Sorry, that file cannot be edited.' ) );
 		}

@@ -588,7 +589,7 @@ function wp_edit_theme_plugin_file( $args ) {
 			}

 			if ( ! isset( $result['message'] ) ) {
-				$message = __( 'An unidentified error has occurred.' );
+				$message = __( 'Something went wrong.' );
 			} else {
 				$message = $result['message'];
 				unset( $result['message'] );
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -241,7 +241,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 				$sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
 			} else {
 				// Force thumbnails to be soft crops.
-				if ( ! 'thumbnail' === $s ) {
+				if ( 'thumbnail' !== $s ) {
 					$sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
 				}
 			}
@@ -343,7 +343,7 @@ function wp_read_image_metadata( $file ) {
 	if ( ! file_exists( $file ) )
 		return false;

-	list( , , $sourceImageType ) = getimagesize( $file );
+	list( , , $sourceImageType ) = @getimagesize( $file );

 	/*
 	 * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -372,10 +372,10 @@ function wp_read_image_metadata( $file ) {
 	 * as caption, description etc.
 	 */
 	if ( is_callable( 'iptcparse' ) ) {
-		getimagesize( $file, $info );
+		@getimagesize( $file, $info );

 		if ( ! empty( $info['APP13'] ) ) {
-			$iptc = iptcparse( $info['APP13'] );
+			$iptc = @iptcparse( $info['APP13'] );

 			// Headline, "A brief synopsis of the caption."
 			if ( ! empty( $iptc['2#105'][0] ) ) {
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -355,7 +355,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 		}

 	// Use image exif/iptc data for title and caption defaults if possible.
-	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
+	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
 			$title = $image_meta['title'];
 		}
@@ -419,7 +419,7 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
 	$content = '';

 	// Use image exif/iptc data for title and caption defaults if possible.
-	if ( $image_meta = @wp_read_image_metadata($file) ) {
+	if ( $image_meta = wp_read_image_metadata( $file ) ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
 			$title = $image_meta['title'];
 		if ( trim( $image_meta['caption'] ) )
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -903,7 +903,7 @@ $default_title = apply_filters( 'default_page_template_title',  __( 'Default Tem
 /**
 * Fires before the help hint text in the 'Page Attributes' meta box.
 *
- * @since 4.8.0
+ * @since 4.9.0
 *
 * @param WP_Post $post The current post.
 */
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -77,12 +77,12 @@ function extract_from_markers( $filename, $marker ) {
 	foreach ( $markerdata as $markerline ) {
 		if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
 			$state = false;
-			if ( $state ) {
-				$result[] = $markerline;
-			}
-			if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
-				$state = true;
-			}
+		}
+		if ( $state ) {
+			$result[] = $markerline;
+		}
+		if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
+			$state = true;
 		}
 	}

@@ -1099,15 +1099,17 @@ function wp_admin_canonical_url() {
 * @since 4.9.0
 */
 function wp_admin_headers() {
-	$policy = 'same-origin';
+	$policy = 'strict-origin-when-cross-origin';

 	/**
-	 * Filters the admin referrer policy header value. Default 'same-origin'.
+	 * Filters the admin referrer policy header value.
 	 *
 	 * @since 4.9.0
+	 * @since 4.9.5 The default value was changed to 'strict-origin-when-cross-origin'.
+	 *
 	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
 	 *
-	 * @param string $policy The referrer policy header value.
+	 * @param string $policy The admin referrer policy header value. Default 'strict-origin-when-cross-origin'.
 	 */
 	$policy = apply_filters( 'admin_referrer_policy', $policy );

--- a/wp-admin/includes/options.php
+++ b/wp-admin/includes/options.php
@@ -51,7 +51,7 @@ function options_general_add_js() {

 		$("input[name='date_format']").click(function(){
 			if ( "date_format_custom_radio" != $(this).attr("id") )
-				$( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+				$( 'input[name="date_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
 		});
 		$( 'input[name="date_format_custom"]' ).on( 'click input', function() {
 			$( '#date_format_custom_radio' ).prop( 'checked', true );
@@ -59,18 +59,23 @@ function options_general_add_js() {

 		$("input[name='time_format']").click(function(){
 			if ( "time_format_custom_radio" != $(this).attr("id") )
-				$( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+				$( 'input[name="time_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
 		});
 		$( 'input[name="time_format_custom"]' ).on( 'click input', function() {
 			$( '#time_format_custom_radio' ).prop( 'checked', true );
 		});
 		$("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
-			var format = $(this);
-			format.siblings( '.spinner' ).addClass( 'is-active' );
-			$.post(ajaxurl, {
-					action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
+			var format = $( this ),
+				fieldset = format.closest( 'fieldset' ),
+				example = fieldset.find( '.example' ),
+				spinner = fieldset.find( '.spinner' );
+
+			spinner.addClass( 'is-active' );
+
+			$.post( ajaxurl, {
+					action: 'date_format_custom' == format.attr( 'name' ) ? 'date_format' : 'time_format',
 					date : format.val()
-				}, function(d) { format.siblings( '.spinner' ).removeClass( 'is-active' ); format.siblings('.example').text(d); } );
+				}, function( d ) { spinner.removeClass( 'is-active' ); example.text( d ); } );
 		});

 		var languageSelect = $( '#WPLANG' );
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -628,7 +628,7 @@ function install_plugin_information() {
 				) );
 				?>
 				<div class="counter-container">
-						<span class="counter-label"><a href="https://wordpress.org/support/view/plugin-reviews/<?php echo $api->slug; ?>?filter=<?php echo $key; ?>"
+						<span class="counter-label"><a href="https://wordpress.org/support/plugin/<?php echo $api->slug; ?>/reviews/?filter=<?php echo $key; ?>"
 						                               target="_blank" aria-label="<?php echo $aria_label; ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a></span>
 						<span class="counter-back">
 							<span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -194,17 +194,6 @@ function get_plugin_files( $plugin ) {
 	$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
 	$dir = dirname( $plugin_file );

-	$data = get_plugin_data( $plugin_file );
-	$label = isset( $data['Version'] )
-		? sanitize_key( 'files_' . $plugin . '-' . $data['Version'] )
-		: sanitize_key( 'files_' . $plugin );
-	$transient_key = substr( $label, 0, 29 ) . md5( $label );
-
-	$plugin_files = get_transient( $transient_key );
-	if ( false !== $plugin_files ) {
-		return $plugin_files;
-	}
-
 	$plugin_files = array( plugin_basename( $plugin_file ) );

 	if ( is_dir( $dir ) && WP_PLUGIN_DIR !== $dir ) {
@@ -225,8 +214,6 @@ function get_plugin_files( $plugin ) {
 		$plugin_files = array_values( array_unique( $plugin_files ) );
 	}

-	set_transient( $transient_key, $plugin_files, HOUR_IN_SECONDS );
-
 	return $plugin_files;
 }

--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1457,8 +1457,9 @@ function get_settings_errors( $setting = '', $sanitize = false ) {
 	}

 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
+	if ( empty( $wp_settings_errors ) ) {
 		return array();
+	}

 	// Filter the results to those of a specific setting if one was set.
 	if ( $setting ) {
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -687,14 +687,14 @@ function customize_themes_print_templates() {

 			<div class="theme-actions">
 				<# if ( data.active ) { #>
-					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></a>
+					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></button>
 				<# } else if ( 'installed' === data.type ) { #>
 					<?php if ( current_user_can( 'delete_themes' ) ) { ?>
 						<# if ( data.actions && data.actions['delete'] ) { #>
 							<a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
 						<# } #>
 					<?php } ?>
-					<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></span>
+					<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
 				<# } else { #>
 					<button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></button>
 					<button type="button" class="button button-primary theme-install preview" data-slug="{{ data.id }}"><?php _e( 'Install &amp; Preview' ); ?></button>
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -743,6 +743,42 @@ $_old_files = array(
 'wp-includes/js/plupload/plupload.silverlight.xap',
 'wp-includes/js/swfupload/plugins',
 'wp-includes/js/swfupload/swfupload.swf',
+	// 4.9.2
+	'wp-includes/js/mediaelement/lang',
+	'wp-includes/js/mediaelement/lang/ca.js',
+	'wp-includes/js/mediaelement/lang/cs.js',
+	'wp-includes/js/mediaelement/lang/de.js',
+	'wp-includes/js/mediaelement/lang/es.js',
+	'wp-includes/js/mediaelement/lang/fa.js',
+	'wp-includes/js/mediaelement/lang/fr.js',
+	'wp-includes/js/mediaelement/lang/hr.js',
+	'wp-includes/js/mediaelement/lang/hu.js',
+	'wp-includes/js/mediaelement/lang/it.js',
+	'wp-includes/js/mediaelement/lang/ja.js',
+	'wp-includes/js/mediaelement/lang/ko.js',
+	'wp-includes/js/mediaelement/lang/nl.js',
+	'wp-includes/js/mediaelement/lang/pl.js',
+	'wp-includes/js/mediaelement/lang/pt.js',
+	'wp-includes/js/mediaelement/lang/ro.js',
+	'wp-includes/js/mediaelement/lang/ru.js',
+	'wp-includes/js/mediaelement/lang/sk.js',
+	'wp-includes/js/mediaelement/lang/sv.js',
+	'wp-includes/js/mediaelement/lang/uk.js',
+	'wp-includes/js/mediaelement/lang/zh-cn.js',
+	'wp-includes/js/mediaelement/lang/zh.js',
+	'wp-includes/js/mediaelement/mediaelement-flash-audio-ogg.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-audio.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-video-hls.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-video-mdash.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-video.swf',
+	'wp-includes/js/mediaelement/renderers/dailymotion.js',
+	'wp-includes/js/mediaelement/renderers/dailymotion.min.js',
+	'wp-includes/js/mediaelement/renderers/facebook.js',
+	'wp-includes/js/mediaelement/renderers/facebook.min.js',
+	'wp-includes/js/mediaelement/renderers/soundcloud.js',
+	'wp-includes/js/mediaelement/renderers/soundcloud.min.js',
+	'wp-includes/js/mediaelement/renderers/twitch.js',
+	'wp-includes/js/mediaelement/renderers/twitch.min.js',
 );

 /**
@@ -1118,7 +1154,11 @@ function update_core($from, $to) {
 		$old_file = $to . $old_file;
 		if ( !$wp_filesystem->exists($old_file) )
 			continue;
-		$wp_filesystem->delete($old_file, true);
+
+		// If the file isn't deleted, try writing an empty string to the file instead.
+		if ( ! $wp_filesystem->delete( $old_file, true ) && $wp_filesystem->is_file( $old_file ) ) {
+			$wp_filesystem->put_contents( $old_file, '' );
+		}
 	}

 	// Remove any Genericons example.html's from the filesystem
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -435,11 +435,11 @@ function wp_upgrade() {
 	if ( is_multisite() ) {
 		$site_id = get_current_blog_id();

-		if ( $wpdb->get_row( $wpdb->prepare( 'SELECT blog_id FROM %s WHERE blog_id = %d', $wpdb->blog_versions, $site_id ) ) ) {
-			$wpdb->query( $wpdb->prepare( 'UPDATE %s SET db_version = %d WHERE blog_id = %d', $wpdb->blog_versions, $wp_db_version, $site_id ) );
- 	    } else {
-			$wpdb->query( $wpdb->prepare( 'INSERT INTO %s ( `blog_id` , `db_version` , `last_updated` ) VALUES ( %d, %d, %s);', $wpdb->blog_versions, $site_id, $wp_db_version, NOW() ) );
- 	    }
+		if ( $wpdb->get_row( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = %d", $site_id ) ) ) {
+			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->blog_versions} SET db_version = %d WHERE blog_id = %d", $wp_db_version, $site_id ) );
+		} else {
+			$wpdb->query( $wpdb->prepare( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( %d, %d, NOW() );", $site_id, $wp_db_version ) );
+		}
 	}

 	/**
--- a/wp-admin/js/customize-controls.js
+++ b/wp-admin/js/customize-controls.js
@@ -1867,6 +1867,9 @@
 				// Search terms.
 				debounced = _.debounce( section.checkTerm, 500 ); // Wait until there is no input for 500 milliseconds to initiate a search.
 				section.contentContainer.on( 'input', '.wp-filter-search', function() {
+					if ( ! api.panel( 'themes' ).expanded() ) {
+						return;
+					}
 					debounced( section );
 					if ( ! section.expanded() ) {
 						section.expand();
@@ -2561,7 +2564,7 @@

 			// Temporary special function since supplying SFTP credentials does not work yet. See #42184.
 			function disableInstallButtons() {
-				return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
+				return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
 			}

 			section.overlay.find( 'button.preview, button.preview-theme' ).toggleClass( 'disabled', disableSwitchButtons() );
@@ -3071,7 +3074,7 @@
 			api.Panel.prototype.attachEvents.apply( panel );

 			// Temporary since supplying SFTP credentials does not work yet. See #42184
-			if ( api.settings.theme._filesystemCredentialsNeeded ) {
+			if ( api.settings.theme._canInstall && api.settings.theme._filesystemCredentialsNeeded ) {
 				panel.notifications.add( new api.Notification( 'theme_install_unavailable', {
 					message: api.l10n.themeInstallUnavailable,
 					type: 'info',
@@ -5129,7 +5132,7 @@

 			// Temporary special function since supplying SFTP credentials does not work yet. See #42184.
 			function disableInstallButtons() {
-				return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
+				return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
 			}
 			function updateButtons() {
 				control.container.find( 'button.preview, button.preview-theme' ).toggleClass( 'disabled', disableSwitchButtons() );
@@ -5280,6 +5283,27 @@
 				codemirror: $.Deferred()
 			} );
 			api.Control.prototype.initialize.call( control, id, options );
+
+			// Note that rendering is debounced so the props will be used when rendering happens after add event.
+			control.notifications.bind( 'add', function( notification ) {
+
+				// Skip if control notification is not from setting csslint_error notification.
+				if ( notification.code !== control.setting.id + ':csslint_error' ) {
+					return;
+				}
+
+				// Customize the template and behavior of csslint_error notifications.
+				notification.templateId = 'customize-code-editor-lint-error-notification';
+				notification.render = (function( render ) {
+					return function() {
+						var li = render.call( this );
+						li.find( 'input[type=checkbox]' ).on( 'click', function() {
+							control.setting.notifications.remove( 'csslint_error' );
+						} );
+						return li;
+					};
+				})( notification.render );
+			} );
 		},

 		/**
@@ -6849,7 +6873,7 @@

 		cheatin: function() {
 			$( document.body ).empty().addClass( 'cheatin' ).append(
-				'<h1>' + api.l10n.cheatin + '</h1>' +
+				'<h1>' + api.l10n.notAllowedHeading + '</h1>' +
 				'<p>' + api.l10n.notAllowed + '</p>'
 			);
 		},
@@ -7907,7 +7931,7 @@
 				previewerAlive = state.instance( 'previewerAlive' ),
 				editShortcutVisibility  = state.instance( 'editShortcutVisibility' ),
 				changesetLocked = state.instance( 'changesetLocked' ),
-				populateChangesetUuidParam;
+				populateChangesetUuidParam, defaultSelectedChangesetStatus;

 			state.bind( 'change', function() {
 				var canSave;
@@ -7941,9 +7965,7 @@
 						} else {
 							saveBtn.val( api.l10n.schedule );
 						}
-					} else if ( ! api.settings.changeset.currentUserCanPublish ) {
-						selectedChangesetStatus( 'draft' );
-					} else {
+					} else if ( api.settings.changeset.currentUserCanPublish ) {
 						saveBtn.val( api.l10n.publish );
 					}
 					closeBtn.find( '.screen-reader-text' ).text( api.l10n.cancel );
@@ -7965,12 +7987,14 @@
 				return status;
 			};

+			defaultSelectedChangesetStatus = api.settings.changeset.currentUserCanPublish ? 'publish' : 'draft';
+
 			// Set default states.
 			changesetStatus( api.settings.changeset.status );
 			changesetLocked( Boolean( api.settings.changeset.lockUser ) );
 			changesetDate( api.settings.changeset.publishDate );
 			selectedChangesetDate( api.settings.changeset.publishDate );
-			selectedChangesetStatus( '' === api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ? 'publish' : api.settings.changeset.status );
+			selectedChangesetStatus( '' === api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ? defaultSelectedChangesetStatus : api.settings.changeset.status );
 			selectedChangesetStatus.link( changesetStatus ); // Ensure that direct updates to status on server via wp.customizer.previewer.save() will update selection.
 			saved( true );
 			if ( '' === changesetStatus() ) { // Handle case for loading starter content.
@@ -8216,6 +8240,7 @@
 			// Check for lock when sending heartbeat requests.
 			$( document ).on( 'heartbeat-send.update_lock_notice', function( event, data ) {
 				data.check_changeset_lock = true;
+				data.changeset_uuid = api.settings.changeset.uuid;
 			} );

 			// Handle heartbeat ticks.
@@ -8248,7 +8273,7 @@

 		// Set up initial notifications.
 		(function() {
-			var removedQueryParams = [];
+			var removedQueryParams = [], autosaveDismissed = false;

 			/**
 			 * Obtain the URL to restore the autosave.
@@ -8294,6 +8319,25 @@
 				history.replaceState( {}, document.title, urlParser.href );
 			}

+			/**
+			 * Dismiss autosave.
+			 *
+			 * @returns {void}
+			 */
+			function dismissAutosave() {
+				if ( autosaveDismissed ) {
+					return;
+				}
+				wp.ajax.post( 'customize_dismiss_autosave_or_lock', {
+					wp_customize: 'on',
+					customize_theme: api.settings.theme.stylesheet,
+					customize_changeset_uuid: api.settings.changeset.uuid,
+					nonce: api.settings.nonce.dismiss_autosave_or_lock,
+					dismiss_autosave: true
+				} );
+				autosaveDismissed = true;
+			}
+
 			/**
 			 * Add notification regarding the availability of an autosave to restore.
 			 *
@@ -8319,15 +8363,7 @@
 						} );

 						// Handle dismissal of notice.
-						li.find( '.notice-dismiss' ).on( 'click', function() {
-							wp.ajax.post( 'customize_dismiss_autosave_or_lock', {
-								wp_customize: 'on',
-								customize_theme: api.settings.theme.stylesheet,
-								customize_changeset_uuid: api.settings.changeset.uuid,
-								nonce: api.settings.nonce.dismiss_autosave_or_lock,
-								dismiss_autosave: true
-							} );
-						} );
+						li.find( '.notice-dismiss' ).on( 'click', dismissAutosave );

 						return li;
 					}
@@ -8335,6 +8371,7 @@

 				// Remove the notification once the user starts making changes.
 				onStateChange = function() {
+					dismissAutosave();
 					api.notifications.remove( code );
 					api.unbind( 'change', onStateChange );
 					api.state( 'changesetStatus' ).unbind( onStateChange );
@@ -9191,12 +9228,14 @@

 			api.unbind( 'change', startAutosaving ); // Ensure startAutosaving only fires once.

-			api.state( 'saved' ).bind( function( isSaved ) {
+			function onChangeSaved( isSaved ) {
 				if ( ! isSaved && ! api.settings.changeset.autosaved ) {
 					api.settings.changeset.autosaved = true; // Once a change is made then autosaving kicks in.
 					api.previewer.send( 'autosaving' );
 				}
-			} );
+			}
+			api.state( 'saved' ).bind( onChangeSaved );
+			onChangeSaved( api.state( 'saved' ).get() );

 			/**
 			 * Request changeset update and then re-schedule the next changeset update time.
--- a/wp-admin/js/customize-controls.min.js
+++ b/wp-admin/js/customize-controls.min.js
--- a/wp-admin/js/customize-nav-menus.js
+++ b/wp-admin/js/customize-nav-menus.js
@@ -537,33 +537,37 @@
 			var menuItem,
 				itemName = $( '#custom-menu-item-name' ),
 				itemUrl = $( '#custom-menu-item-url' ),
-				urlRegex,
-				urlValue;
+				urlRegex;

 			if ( ! this.currentMenuControl ) {
 				return;
 			}

 			/*
-			 * Copyright (c) 2010-2013 Diego Perini, MIT licensed
-			 * https://gist.github.com/dperini/729294
-			 * see also https://mathiasbynens.be/demo/url-regex
-			 * modified to allow protocol-relative URLs
+			 * Allow URLs including:
+			 * - http://example.com/
+			 * - //example.com
+			 * - /directory/
+			 * - ?query-param
+			 * - #target
+			 * - mailto:foo@example.com
+			 *
+			 * Any further validation will be handled on the server when the setting is attempted to be saved,
+			 * so this pattern does not need to be complete.
 			 */
-			urlRegex = /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i;
+			urlRegex = /^((\w+:)?\/\/\w.*|\w+:(?!\/\/$)|\/|\?|#)/;

-			urlValue = itemUrl.val();
 			if ( '' === itemName.val() ) {
 				itemName.addClass( 'invalid' );
 				return;
-			} else if ( '' === urlValue || 'http://' === urlValue || ! ( '/' === urlValue[0] || urlRegex.test( urlValue ) ) ) {
+			} else if ( ! urlRegex.test( itemUrl.val() ) ) {
 				itemUrl.addClass( 'invalid' );
 				return;
 			}

 			menuItem = {
 				'title': itemName.val(),
-				'url': urlValue,
+				'url': itemUrl.val(),
 				'type': 'custom',
 				'type_label': api.Menus.data.l10n.custom_label,
 				'object': 'custom'
@@ -719,7 +723,7 @@
 			$( 'body' ).removeClass( 'adding-menu-items' );
 			$( '#available-menu-items .menu-item-handle.item-added' ).removeClass( 'item-added' );

-			this.$search.val( '' );
+			this.$search.val( '' ).trigger( 'keyup' );
 		},

 		// Add a few keyboard enhancements to the panel.
--- a/wp-admin/js/customize-nav-menus.min.js
+++ b/wp-admin/js/customize-nav-menus.min.js
--- a/wp-admin/js/editor.js
+++ b/wp-admin/js/editor.js
@@ -270,7 +270,7 @@ window.wp = window.wp || {};
 			if ( shortcodes ) {
 				for ( var i = 0; i < shortcodes.length; i++ ) {
 					var shortcode = shortcodes[ i ].replace( /^\[+/g, '' );
-	
+
 					if ( result.indexOf( shortcode ) === -1 ) {
 						result.push( shortcode );
 					}
@@ -280,30 +280,6 @@ window.wp = window.wp || {};
 			return result;
 		}

-		/**
-		 * @summary Check if a shortcode has Live Preview enabled for it.
-		 *
-		 * Previewable shortcodes here refers to shortcodes that have Live Preview enabled.
-		 *
-		 * These shortcodes get rewritten when the editor is in Visual mode, which means that
-		 * we don't want to change anything inside them, i.e. inserting a selection marker
-		 * inside the shortcode will break it :(
-		 *
-		 * @link wp-includes/js/mce-view.js
-		 *
-		 * @param {string} shortcode The shortcode to check.
-		 * @return {boolean} If a shortcode has Live Preview or not
-		 */
-		function isShortcodePreviewable( shortcode ) {
-			var defaultPreviewableShortcodes = [ 'caption' ];
-
-			return (
-				defaultPreviewableShortcodes.indexOf( shortcode ) !== -1 ||
-				wp.mce.views.get( shortcode ) !== undefined
-			);
-
-		}
-
 		/**
 		 * @summary Get all shortcodes and their positions in the content
 		 *
@@ -340,23 +316,12 @@ window.wp = window.wp || {};
 				 */
 				var showAsPlainText = shortcodeMatch[1] === '[';

-				/**
-				 * For more context check the docs for:
-				 *
-				 * @link isShortcodePreviewable
-				 *
-				 * In addition, if the shortcode will get rendered as plain text ( see above ),
-				 * we can treat it as text and use the selection markers in it.
-				 */
-				var isPreviewable = ! showAsPlainText && isShortcodePreviewable( shortcodeMatch[2] );
-
 				shortcodeInfo = {
 					shortcodeName: shortcodeMatch[2],
 					showAsPlainText: showAsPlainText,
 					startIndex: shortcodeMatch.index,
 					endIndex: shortcodeMatch.index + shortcodeMatch[0].length,
-					length: shortcodeMatch[0].length,
-					isPreviewable: isPreviewable
+					length: shortcodeMatch[0].length
 				};

 				shortcodesDetails.push( shortcodeInfo );
@@ -382,7 +347,6 @@ window.wp = window.wp || {};
 					startIndex: shortcodeMatch.index,
 					endIndex: shortcodeMatch.index + shortcodeMatch[ 0 ].length,
 					length: shortcodeMatch[ 0 ].length,
-					isPreviewable: true,
 					urlAtStartOfContent: shortcodeMatch[ 1 ] === '',
 					urlAtEndOfContent: shortcodeMatch[ 3 ] === ''
 				};
@@ -465,7 +429,7 @@ window.wp = window.wp || {};
 			}

 			var isCursorStartInShortcode = getShortcodeWrapperInfo( content, cursorStart );
-			if ( isCursorStartInShortcode && isCursorStartInShortcode.isPreviewable ) {
+			if ( isCursorStartInShortcode && ! isCursorStartInShortcode.showAsPlainText ) {
 				/**
 				 * If a URL is at the start or the end of the content,
 				 * the selection doesn't work, because it inserts a marker in the text,
@@ -482,7 +446,7 @@ window.wp = window.wp || {};
 			}

 			var isCursorEndInShortcode = getShortcodeWrapperInfo( content, cursorEnd );
-			if ( isCursorEndInShortcode && isCursorEndInShortcode.isPreviewable ) {
+			if ( isCursorEndInShortcode && ! isCursorEndInShortcode.showAsPlainText ) {
 				if ( isCursorEndInShortcode.urlAtEndOfContent ) {
 					cursorEnd = isCursorEndInShortcode.startIndex;
 				} else {
@@ -581,6 +545,8 @@ window.wp = window.wp || {};

 			removeSelectionMarker( startNode );
 			removeSelectionMarker( endNode );
+
+			editor.save();
 		}

 		/**
@@ -623,7 +589,9 @@ window.wp = window.wp || {};

 				edTools = $( '#wp-content-editor-tools' ),
 				edToolsHeight = 0,
-				edToolsOffsetTop = 0;
+				edToolsOffsetTop = 0,
+
+				$scrollArea;

 			if ( edTools.length ) {
 				edToolsHeight = edTools.height();
@@ -635,6 +603,11 @@ window.wp = window.wp || {};
 				selectionPosition = TinyMCEContentAreaTop + elementTop,
 				visibleAreaHeight = windowHeight - ( edToolsHeight + toolbarHeight );

+			// There's no need to scroll if the selection is inside the visible area.
+			if ( selectionPosition < visibleAreaHeight ) {
+				return;
+			}
+
 			/**
 			 * The minimum scroll height should be to the top of the editor, to offer a consistent
 			 * experience.
@@ -643,9 +616,16 @@ window.wp = window.wp || {};
 			 * subtracting the height. This gives the scroll position where the top of the editor tools aligns with
 			 * the top of the viewport (under the Master Bar)
 			 */
-			var adjustedScroll = Math.max( selectionPosition - visibleAreaHeight / 2, edToolsOffsetTop - edToolsHeight );
+			var adjustedScroll;
+			if ( editor.settings.wp_autoresize_on ) {
+				$scrollArea = $( 'html,body' );
+				adjustedScroll = Math.max( selectionPosition - visibleAreaHeight / 2, edToolsOffsetTop - edToolsHeight );
+			} else {
+				$scrollArea = $( editor.contentDocument ).find( 'html,body' );
+				adjustedScroll = elementTop;
+			}

-			$( 'html,body' ).animate( {
+			$scrollArea.animate( {
 				scrollTop: parseInt( adjustedScroll, 10 )
 			}, 100 );
 		}
@@ -679,10 +659,10 @@ window.wp = window.wp || {};
 		 */
 		function findBookmarkedPosition( editor ) {
 			// Get the TinyMCE `window` reference, since we need to access the raw selection.
-			var TinyMCEWIndow = editor.getWin(),
-				selection = TinyMCEWIndow.getSelection();
+			var TinyMCEWindow = editor.getWin(),
+				selection = TinyMCEWindow.getSelection();

-			if ( selection.rangeCount <= 0 ) {
+			if ( ! selection || selection.rangeCount < 1 ) {
 				// no selection, no need to continue.
 				return;
 			}
@@ -852,19 +832,16 @@ window.wp = window.wp || {};
 				end = selection.end || selection.start;

 			if ( textArea.focus ) {
-				// focus and scroll to the position
+				// Wait for the Visual editor to be hidden, then focus and scroll to the position
 				setTimeout( function() {
+					textArea.setSelectionRange( start, end );
 					if ( textArea.blur ) {
 						// defocus before focusing
 						textArea.blur();
 					}
 					textArea.focus();
 				}, 100 );
-
-				textArea.focus();
 			}
-
-			textArea.setSelectionRange( start, end );
 		}

 		// Restore the selection when the editor is initialized. Needed when the Text editor is the default.
@@ -1035,10 +1012,6 @@ window.wp = window.wp || {};
 			// Normalize line breaks.
 			text = text.replace( /\r\n|\r/g, '\n' );

-			if ( text.indexOf( '\n' ) === -1 ) {
-				return text;
-			}
-
 			// Remove line breaks from <object>.
 			if ( text.indexOf( '<object' ) !== -1 ) {
 				text = text.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
--- a/wp-admin/js/editor.min.js
+++ b/wp-admin/js/editor.min.js
--- a/wp-admin/js/image-edit.js
+++ b/wp-admin/js/image-edit.js
@@ -627,7 +627,7 @@
 				 *
 				 * @returns {void}
 				 */
-				parent.children().mousedown(function(e){
+				parent.children().on( 'mousedown, touchstart', function(e){
 					var ratio = false, sel, defRatio;

 					if ( e.shiftKey ) {
--- a/wp-admin/js/image-edit.min.js
+++ b/wp-admin/js/image-edit.min.js
--- a/wp-admin/js/plugin-install.js
+++ b/wp-admin/js/plugin-install.js
@@ -146,8 +146,13 @@ jQuery( document ).ready( function( $ ) {
 		}
 	}

-	// Open the Plugin details modal.
-	$( '.thickbox.open-plugin-details-modal' ).on( 'click', function( e ) {
+	/*
+	 * Open the Plugin details modal. The event is delegated to get also the links
+	 * in the plugins search tab, after the AJAX search rebuilds the HTML. It's
+	 * delegated on the closest ancestor and not on the body to avoid conflicts
+	 * with other handlers, see Trac ticket #43082.
+	 */
+	$( '.wrap' ).on( 'click', '.thickbox.open-plugin-details-modal', function( e ) {
 		// The `data-title` attribute is used only in the Plugin screens.
 		var title = $( this ).data( 'title' ) ? plugininstallL10n.plugin_information + ' ' + $( this ).data( 'title' ) : plugininstallL10n.plugin_modal_label;

--- a/wp-admin/js/plugin-install.min.js
+++ b/wp-admin/js/plugin-install.min.js
@@ -1 +1 @@
-var tb_position;jQuery(document).ready(function(a){function b(){var b=e.find("#TB_iframeContent");f=b.contents().find("body"),c(),h.focus(),a("#plugin-information-tabs a",f).on("click",function(){c()}),f.on("keydown",function(a){27===a.which&&tb_remove()})}function c(){var b;g=a(":tabbable",f),h=e.find("#TB_closeWindowButton"),i=g.last(),b=h.add(i),b.off("keydown.wp-plugin-details"),b.on("keydown.wp-plugin-details",function(a){d(a)})}function d(a){9===a.which&&(i[0]!==a.target||a.shiftKey?h[0]===a.target&&a.shiftKey&&(a.preventDefault(),i.focus()):(a.preventDefault(),h.focus()))}var e,f,g,h,i,j=a(),k=a(".upload-view-toggle"),l=a(".wrap"),m=a(document.body);tb_position=function(){var b=a(window).width(),c=a(window).height()-(792<b?60:20),d=792<b?772:b-20;return e=a("#TB_window"),e.length&&(e.width(d).height(c),a("#TB_iframeContent").width(d).height(c),e.css({"margin-left":"-"+parseInt(d/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&e.css({top:"30px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+d+"&height="+c))})},a(window).resize(function(){tb_position()}),m.on("thickbox:iframe:loaded",e,function(){e.hasClass("plugin-details-modal")&&b()}).on("thickbox:removed",function(){j.focus()}),a(".thickbox.open-plugin-details-modal").on("click",function(b){var c=a(this).data("title")?plugininstallL10n.plugin_information+" "+a(this).data("title"):plugininstallL10n.plugin_modal_label;b.preventDefault(),b.stopPropagation(),j=a(this),tb_click.call(this),e.attr({role:"dialog","aria-label":plugininstallL10n.plugin_modal_label}).addClass("plugin-details-modal"),e.find("#TB_iframeContent").attr("title",c)}),a("#plugin-information-tabs a").click(function(b){var c=a(this).attr("name");b.preventDefault(),a("#plugin-information-tabs a.current").removeClass("current"),a(this).addClass("current"),"description"!==c&&a(window).width()<772?a("#plugin-information-content").find(".fyi").hide():a("#plugin-information-content").find(".fyi").show(),a("#section-holder div.section").hide(),a("#section-"+c).show()}),l.hasClass("plugin-install-tab-upload")||k.attr({role:"button","aria-expanded":"false"}).on("click",function(a){a.preventDefault(),m.toggleClass("show-upload-view"),k.attr("aria-expanded",m.hasClass("show-upload-view"))})});
+var tb_position;jQuery(document).ready(function(a){function b(){var b=e.find("#TB_iframeContent");f=b.contents().find("body"),c(),h.focus(),a("#plugin-information-tabs a",f).on("click",function(){c()}),f.on("keydown",function(a){27===a.which&&tb_remove()})}function c(){var b;g=a(":tabbable",f),h=e.find("#TB_closeWindowButton"),i=g.last(),b=h.add(i),b.off("keydown.wp-plugin-details"),b.on("keydown.wp-plugin-details",function(a){d(a)})}function d(a){9===a.which&&(i[0]!==a.target||a.shiftKey?h[0]===a.target&&a.shiftKey&&(a.preventDefault(),i.focus()):(a.preventDefault(),h.focus()))}var e,f,g,h,i,j=a(),k=a(".upload-view-toggle"),l=a(".wrap"),m=a(document.body);tb_position=function(){var b=a(window).width(),c=a(window).height()-(792<b?60:20),d=792<b?772:b-20;return e=a("#TB_window"),e.length&&(e.width(d).height(c),a("#TB_iframeContent").width(d).height(c),e.css({"margin-left":"-"+parseInt(d/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&e.css({top:"30px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+d+"&height="+c))})},a(window).resize(function(){tb_position()}),m.on("thickbox:iframe:loaded",e,function(){e.hasClass("plugin-details-modal")&&b()}).on("thickbox:removed",function(){j.focus()}),a(".wrap").on("click",".thickbox.open-plugin-details-modal",function(b){var c=a(this).data("title")?plugininstallL10n.plugin_information+" "+a(this).data("title"):plugininstallL10n.plugin_modal_label;b.preventDefault(),b.stopPropagation(),j=a(this),tb_click.call(this),e.attr({role:"dialog","aria-label":plugininstallL10n.plugin_modal_label}).addClass("plugin-details-modal"),e.find("#TB_iframeContent").attr("title",c)}),a("#plugin-information-tabs a").click(function(b){var c=a(this).attr("name");b.preventDefault(),a("#plugin-information-tabs a.current").removeClass("current"),a(this).addClass("current"),"description"!==c&&a(window).width()<772?a("#plugin-information-content").find(".fyi").hide():a("#plugin-information-content").find(".fyi").show(),a("#section-holder div.section").hide(),a("#section-"+c).show()}),l.hasClass("plugin-install-tab-upload")||k.attr({role:"button","aria-expanded":"false"}).on("click",function(a){a.preventDefault(),m.toggleClass("show-upload-view"),k.attr("aria-expanded",m.hasClass("show-upload-view"))})});
--- a/wp-admin/js/theme.js
+++ b/wp-admin/js/theme.js
@@ -102,7 +102,7 @@ themes.view.Appearance = wp.Backbone.View.extend({
 			collection: self.collection,
 			parent: this
 		});
-		self.searchView = view;
+		self.SearchView = view;

 		// Render and append after screen title
 		view.render();
@@ -1448,7 +1448,7 @@ themes.Run = {
 		this.render();

 		// Start debouncing user searches after Backbone.history.start().
-		this.view.searchView.doSearch = _.debounce( this.view.searchView.doSearch, 500 );
+		this.view.SearchView.doSearch = _.debounce( this.view.SearchView.doSearch, 500 );
 	},

 	render: function() {
@@ -1924,7 +1924,7 @@ themes.RunInstaller = {
 		this.render();

 		// Start debouncing user searches after Backbone.history.start().
-		this.view.searchView.doSearch = _.debounce( this.view.searchView.doSearch, 500 );
+		this.view.SearchView.doSearch = _.debounce( this.view.SearchView.doSearch, 500 );
 	},

 	render: function() {
--- a/wp-admin/js/theme.min.js
+++ b/wp-admin/js/theme.min.js
--- a/wp-admin/js/updates.js
+++ b/wp-admin/js/updates.js
@@ -2437,7 +2437,7 @@
 				return;
 			}

-			if ( 'undefined' === typeof message.action ) {
+			if ( ! message || 'undefined' === typeof message.action ) {
 				return;
 			}

--- a/wp-admin/js/updates.min.js
+++ b/wp-admin/js/updates.min.js
--- a/wp-admin/js/widgets.js
+++ b/wp-admin/js/widgets.js
@@ -513,9 +513,10 @@ wpWidgets = {
 	save : function( widget, del, animate, order ) {
 		var self = this, data, a,
 			sidebarId = widget.closest( 'div.widgets-sortables' ).attr( 'id' ),
-			form = widget.find( 'form' );
+			form = widget.find( 'form' ),
+			isAdd = widget.find( 'input.add_new' ).val();

-		if ( ! del && form.prop( 'checkValidity' ) && ! form[0].checkValidity() ) {
+		if ( ! del && ! isAdd && form.prop( 'checkValidity' ) && ! form[0].checkValidity() ) {
 			return;
 		}

--- a/wp-admin/js/widgets.min.js
+++ b/wp-admin/js/widgets.min.js
--- a/wp-admin/js/widgets/custom-html-widgets.js
+++ b/wp-admin/js/widgets/custom-html-widgets.js
@@ -204,7 +204,7 @@ wp.customHtmlWidgets = ( function( $ ) {
 				 * @returns {void}
 				 */
 				onUpdateErrorNotice: function onUpdateErrorNotice( errorAnnotations ) {
-					control.saveButton.toggleClass( 'validation-blocked disabled', errorAnnotations.length );
+					control.saveButton.toggleClass( 'validation-blocked disabled', errorAnnotations.length > 0 );
 					control.updateErrorNotice( errorAnnotations );
 				}
 			});
--- a/wp-admin/js/widgets/custom-html-widgets.min.js
+++ b/wp-admin/js/widgets/custom-html-widgets.min.js
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -34,7 +34,7 @@ $post_id = isset($post_id)? (int) $post_id : 0;
 // Require an ID for the edit screen.
 if ( isset( $action ) && $action == 'edit' && !$ID ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 		'<p>' . __( 'Invalid item ID.' ) . '</p>',
 		403
 	);
@@ -42,7 +42,7 @@ if ( isset( $action ) && $action == 'edit' && !$ID ) {

 if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
 		403
 	);
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -21,7 +21,7 @@ if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets'
 // Permissions Check
 if ( ! current_user_can( 'edit_theme_options' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
 		403
 	);
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -83,7 +83,7 @@ if ( $_POST ) {
 	);

 	// Handle translation installation.
-	if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
+	if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
 		$language = wp_download_language_pack( $_POST['WPLANG'] );
 		if ( $language ) {
 			$_POST['WPLANG'] = $language;
@@ -374,14 +374,16 @@ if ( isset( $_GET['updated'] ) ) {
 							$lang = '';
 						}

-						wp_dropdown_languages( array(
-							'name'         => 'WPLANG',
-							'id'           => 'WPLANG',
-							'selected'     => $lang,
-							'languages'    => $languages,
-							'translations' => $translations,
-							'show_available_translations' => current_user_can( 'install_languages' ),
-						) );
+						wp_dropdown_languages(
+							array(
+								'name'         => 'WPLANG',
+								'id'           => 'WPLANG',
+								'selected'     => $lang,
+								'languages'    => $languages,
+								'translations' => $translations,
+								'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
+							)
+						);
 						?>
 					</td>
 				</tr>
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -68,7 +68,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 			$meta['WPLANG'] = ''; // en_US
 		} elseif ( in_array( $_POST['WPLANG'], get_available_languages() ) ) {
 			$meta['WPLANG'] = $_POST['WPLANG'];
-		} elseif ( current_user_can( 'install_languages' ) ) {
+		} elseif ( current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
 			$language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
 			if ( $language ) {
 				$meta['WPLANG'] = $language;
@@ -230,14 +230,16 @@ if ( ! empty( $messages ) ) {
 						$lang = '';
 					}

-					wp_dropdown_languages( array(
-						'name'                        => 'WPLANG',
-						'id'                          => 'site-language',
-						'selected'                    => $lang,
-						'languages'                   => $languages,
-						'translations'                => $translations,
-						'show_available_translations' => current_user_can( 'install_languages' ),
-					) );
+					wp_dropdown_languages(
+						array(
+							'name'                        => 'WPLANG',
+							'id'                          => 'site-language',
+							'selected'                    => $lang,
+							'languages'                   => $languages,
+							'translations'                => $translations,
+							'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
+						)
+					);
 					?>
 				</td>
 			</tr>
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -154,7 +154,7 @@ if ( $action ) {
 					// If the user doesn't already belong to the blog, bail.
 					if ( ! is_user_member_of_blog( $user_id ) ) {
 						wp_die(
-							'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+							'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 							'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
 							403
 						);
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -158,7 +158,7 @@ if ( ! empty( $languages ) || ! empty( $translations ) ) {
 				'selected'     => $locale,
 				'languages'    => $languages,
 				'translations' => $translations,
-				'show_available_translations' => current_user_can( 'install_languages' ),
+				'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
 			) );

 			// Add note about deprecated WPLANG constant.
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -51,13 +51,15 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <table class="form-table">
 <tr>
 <th scope="row"><?php _e('Thumbnail size') ?></th>
-<td>
-<label for="thumbnail_size_w"><?php _e('Width'); ?></label>
-<input name="thumbnail_size_w" type="number" step="1" min="0" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" class="small-text" />
-<label for="thumbnail_size_h"><?php _e('Height'); ?></label>
-<input name="thumbnail_size_h" type="number" step="1" min="0" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" class="small-text" />
-<p><input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked('1', get_option('thumbnail_crop')); ?>/>
-<label for="thumbnail_crop"><?php _e('Crop thumbnail to exact dimensions (normally thumbnails are proportional)'); ?></label></p>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Thumbnail size' ); ?></span></legend>
+<label for="thumbnail_size_w"><?php _e( 'Width' ); ?></label>
+<input name="thumbnail_size_w" type="number" step="1" min="0" id="thumbnail_size_w" value="<?php form_option( 'thumbnail_size_w' ); ?>" class="small-text" />
+<br />
+<label for="thumbnail_size_h"><?php _e( 'Height' ); ?></label>
+<input name="thumbnail_size_h" type="number" step="1" min="0" id="thumbnail_size_h" value="<?php form_option( 'thumbnail_size_h' ); ?>" class="small-text" />
+</fieldset>
+<input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked( '1', get_option( 'thumbnail_crop' ) ); ?>/>
+<label for="thumbnail_crop"><?php _e( 'Crop thumbnail to exact dimensions (normally thumbnails are proportional)' ); ?></label>
 </td>
 </tr>

--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -46,7 +46,7 @@ if ( empty($option_page) ) {

 if ( ! current_user_can( $capability ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to manage these options.' ) . '</p>',
 		403
 	);
@@ -74,7 +74,7 @@ if ( ! empty( $_GET[ 'adminhash' ] ) ) {

 if ( is_multisite() && ! current_user_can( 'manage_network_options' ) && 'update' != $action ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
 		403
 	);
@@ -180,9 +180,11 @@ if ( 'update' == $action ) {
 		if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
 			require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );

-			$language = wp_download_language_pack( $_POST['WPLANG'] );
-			if ( $language ) {
-				$_POST['WPLANG'] = $language;
+			if ( wp_can_install_language_pack() ) {
+				$language = wp_download_language_pack( $_POST['WPLANG'] );
+				if ( $language ) {
+					$_POST['WPLANG'] = $language;
+				}
 			}
 		}
 	}
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -56,7 +56,7 @@ $editing = true;

 if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
 		403
 	);
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -18,7 +18,7 @@ function wp_load_press_this() {
 	if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
 		wp_die(
 			__( 'Sorry, you are not allowed to create posts as this user.' ),
-			__( 'Cheatin&#8217; uh?' ),
+			__( 'You need a higher level of permission.' ),
 			403
 		);
 	} elseif ( is_plugin_active( $plugin_file ) ) {
--- a/wp-admin/privacy.php
+++ b/wp-admin/privacy.php
@@ -19,7 +19,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s will smooth your design workflow and keep you safe from coding errors.' ), $display_version ); ?></p>

 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

--- a/wp-admin/term.php
+++ b/wp-admin/term.php
@@ -34,7 +34,7 @@ if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) ||
     ! current_user_can( 'edit_term', $tag->term_id )
 ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
 		403
 	);
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -229,20 +229,20 @@ if ( $theme->errors() )
 ?>
 <div id="templateside">
 	<h2 id="theme-files-label"><?php _e( 'Theme Files' ); ?></h2>
-	<?php
-	if ( $has_templates || $theme->parent() ) :
-		if ( $theme->parent() ) {
-			/* translators: %s: link to edit parent theme */
-			echo '<p class="howto">' . sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
-				sprintf( '<a href="%s">%s</a>',
-					self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
-					$theme->parent()->display( 'Name' )
-				)
-			) . "</p>\n";
-		}
-	endif;
-	?>
 	<ul role="tree" aria-labelledby="theme-files-label">
+		<?php if ( ( $has_templates || $theme->parent() ) && $theme->parent() ) : ?>
+			<li class="howto">
+				<?php
+				/* translators: %s: link to edit parent theme */
+				echo sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
+					sprintf( '<a href="%s">%s</a>',
+						self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
+						$theme->parent()->display( 'Name' )
+					)
+				);
+				?>
+			</li>
+		<?php endif; ?>
 		<li role="treeitem" tabindex="-1" aria-expanded="true" aria-level="1" aria-posinset="1" aria-setsize="1">
 			<ul role="group">
 				<?php wp_print_theme_file_tree( wp_make_theme_file_tree( $allowed_files ) ); ?>
@@ -322,7 +322,7 @@ if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :
 					echo sprintf(
 						/* translators: %s: Codex URL */
 						__( 'You appear to be making direct edits to your theme in the WordPress dashboard. We recommend that you don&#8217;t! Editing your theme directly could break your site and your changes may be lost in future updates. If you need to tweak more than your theme&#8217;s CSS, you might want to try <a href="%s">making a child theme</a>.' ),
-						esc_url( 'https://codex.wordpress.org/Child_Themes' )
+						esc_url( __( 'https://codex.wordpress.org/Child_Themes' ) )
 					);
 					?>
 				</p>
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -207,7 +207,7 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 			foreach ( $features as $feature => $feature_name ) {
 				$feature = esc_attr( $feature );
 				echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label><br>';
+				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label>';
 			}
 			echo '</div>';
 			echo '</fieldset>';
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -11,7 +11,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' );

 if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
 		403
 	);
@@ -24,7 +24,7 @@ if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {

 		if ( ! $theme->exists() || ! $theme->is_allowed() ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The requested theme does not exist.' ) . '</p>',
 				403
 			);
@@ -39,7 +39,7 @@ if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {

 		if ( ! current_user_can( 'delete_themes' ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 				'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
 				403
 			);
@@ -47,7 +47,7 @@ if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {

 		if ( ! $theme->exists() ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The requested theme does not exist.' ) . '</p>',
 				403
 			);
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -12,14 +12,14 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 if ( is_multisite() ) {
 	if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
 			403
 		);
 	}
 } elseif ( ! current_user_can( 'create_users' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
 		403
 	);
@@ -52,7 +52,7 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {

 	if ( ! current_user_can( 'promote_user', $user_details->ID ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
 			403
 		);
@@ -75,7 +75,7 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
 				$redirect = add_query_arg( array( 'update' => 'could_not_add' ), 'user-new.php' );
 			}
 		} else {
-			$newuser_key = substr( md5( $user_id ), 0, 5 );
+			$newuser_key = wp_generate_password( 20, false );
 			add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );

 			$roles = get_editable_roles();
@@ -118,7 +118,7 @@ Please click the following link to confirm the invite:

 	if ( ! current_user_can( 'create_users' ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
 			403
 		);
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -12,7 +12,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' );

 if ( ! current_user_can( 'list_users' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to list users.' ) . '</p>',
 		403
 	);
@@ -130,7 +130,7 @@ case 'promote':
 		// If the user doesn't already belong to the blog, bail.
 		if ( is_multisite() && !is_user_member_of_blog( $id ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
 				403
 			);
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -14,7 +14,7 @@ require_once(ABSPATH . 'wp-admin/includes/widgets.php');

 if ( ! current_user_can( 'edit_theme_options' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
 		403
 	);
--- a/wp-content/plugins/hello.php
+++ b/wp-content/plugins/hello.php
@@ -1,14 +1,14 @@
 <?php
 /**
 * @package Hello_Dolly
- * @version 1.6
+ * @version 1.7
 */
 /*
 Plugin Name: Hello Dolly
 Plugin URI: http://wordpress.org/plugins/hello-dolly/
 Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
 Author: Matt Mullenweg
-Version: 1.6
+Version: 1.7
 Author URI: http://ma.tt/
 */

@@ -21,12 +21,11 @@ You're lookin' swell, Dolly
 I can tell, Dolly
 You're still glowin', you're still crowin'
 You're still goin' strong
-We feel the room swayin'
+I feel the room swayin'
 While the band's playin'
-One of your old favourite songs from way back when
+One of our old favorite songs from way back when
 So, take her wrap, fellas
-Find her an empty lap, fellas
-Dolly'll never go away again
+Dolly, never go away again 
 Hello, Dolly
 Well, hello, Dolly
 It's so nice to have you back where you belong
@@ -34,13 +33,13 @@ You're lookin' swell, Dolly
 I can tell, Dolly
 You're still glowin', you're still crowin'
 You're still goin' strong
-We feel the room swayin'
+I feel the room swayin'
 While the band's playin'
-One of your old favourite songs from way back when
-Golly, gee, fellas
-Find her a vacant knee, fellas
-Dolly'll never go away
-Dolly'll never go away
+One of our old favorite songs from way back when
+So, golly, gee, fellas
+Have a little faith in me, fellas
+Dolly, never go away
+Promise, you'll never go away
 Dolly'll never go away again";

 	// Here we split it into lines
--- a/Show More
+++ b/Show More