diff --git wp-admin/css/common-rtl.css wp-admin/css/common-rtl.css
index 147effe..e21182e 100644
--- wp-admin/css/common-rtl.css
+++ wp-admin/css/common-rtl.css
@@ -551,18 +551,21 @@ code {
 }
 
 div.updated,
+div.warning,
 div.error {
 	padding: 0 0.6em;
 	margin: 5px 15px 2px;
 }
 
 div.updated p,
+div.warning p,
 div.error p {
 	margin: 0.5em 0;
 	padding: 2px;
 }
 
 .wrap div.updated,
+.wrap div.warning,
 .wrap div.error,
 .media-upload-form div.error {
 	margin: 5px 0 15px;
@@ -576,6 +579,14 @@ div.updated {
 	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
 }
 
+div.warning {
+	border-right: 4px solid #ffba00;
+	padding: 1px 12px;
+	background-color: #fff;
+	-webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+}
+
 div.error {
 	border-right: 4px solid #dd3d36;
 	background: #fff;
@@ -3106,7 +3117,7 @@ img {
 	}
 
 	/* Feedback Messages */
-	.wrap div.updated, .wrap div.error, .media-upload-form div.error {
+	.wrap div.updated, .wrap div.warning, .wrap div.error, .media-upload-form div.error {
 		margin: 20px 0 10px 0;
 		padding: 5px 10px;
 		font-size: 14px;
diff --git wp-admin/css/common.css wp-admin/css/common.css
index 172f152..398de05 100644
--- wp-admin/css/common.css
+++ wp-admin/css/common.css
@@ -551,18 +551,21 @@ code {
 }
 
 div.updated,
+div.warning,
 div.error {
 	padding: 0 0.6em;
 	margin: 5px 15px 2px;
 }
 
 div.updated p,
+div.warning p,
 div.error p {
 	margin: 0.5em 0;
 	padding: 2px;
 }
 
 .wrap div.updated,
+.wrap div.warning,
 .wrap div.error,
 .media-upload-form div.error {
 	margin: 5px 0 15px;
@@ -576,6 +579,14 @@ div.updated {
 	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
 }
 
+div.warning {
+	border-left: 4px solid #ffba00;
+	padding: 1px 12px;
+	background-color: #fff;
+	-webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
+}
+
 div.error {
 	border-left: 4px solid #dd3d36;
 	background: #fff;
@@ -3106,7 +3117,7 @@ img {
 	}
 
 	/* Feedback Messages */
-	.wrap div.updated, .wrap div.error, .media-upload-form div.error {
+	.wrap div.updated, .wrap div.warning, .wrap div.error, .media-upload-form div.error {
 		margin: 20px 0 10px 0;
 		padding: 5px 10px;
 		font-size: 14px;
diff --git wp-admin/includes/template.php wp-admin/includes/template.php
index 5304cf8..d7df5df 100644
--- wp-admin/includes/template.php
+++ wp-admin/includes/template.php
@@ -1313,7 +1313,7 @@ function do_settings_fields($page, $section) {
  * @param string $setting Slug title of the setting to which this error applies
  * @param string $code Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
  * @param string $message The formatted message text to display to the user (will be shown inside styled <div> and <p>)
- * @param string $type The type of message it is, controls HTML class. Use 'error' or 'updated'.
+ * @param string $type The type of message it is, controls HTML class. Use 'error', 'updated' or, since 4.1.0, 'warning'.
  */
 function add_settings_error( $setting, $code, $message, $type = 'error' ) {
 	global $wp_settings_errors;
diff --git wp-admin/js/common.js wp-admin/js/common.js
index fe46474..0dfe4c3 100644
--- wp-admin/js/common.js
+++ wp-admin/js/common.js
@@ -358,9 +358,9 @@ $(document).ready( function() {
 		});
 	}
 
-	// Move .updated and .error alert boxes. Don't move boxes designed to be inline.
-	$('div.wrap h2:first').nextAll('div.updated, div.error').addClass('below-h2');
-	$('div.updated, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') );
+	// Move .updated, .warning and .error alert boxes. Don't move boxes designed to be inline.
+	$('div.wrap h2:first').nextAll('div.updated, div.warning, div.error').addClass('below-h2');
+	$('div.updated, div.warning, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') );
 
 	// Init screen meta
 	screenMeta.init();