diff -u b/.htaccess b/.htaccess
--- b/.htaccess
+++ b/.htaccess
@@ -138,7 +138,8 @@
   # security, you can replace '!/' with '!^/'.
   # Allow access to PHP files in /core (like authorize.php or install.php):
   RewriteCond %{REQUEST_URI} !/core/[^/]*\.php$
-  # @todo Remove this once the <none> bug is fixed.
+  # @todo Remove this once the <none> bug pointed out in issues #2417827-10
+  # and #2042447-92 is fixed.
   RewriteCond %{REQUEST_URI} !/core/authorize.php/<none>$
   # Allow access to test-specific PHP files:
   RewriteCond %{REQUEST_URI} !/core/modules/system/tests/https?.php
diff -u b/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc
--- b/core/includes/theme.maintenance.inc
+++ b/core/includes/theme.maintenance.inc
@@ -155,6 +155,5 @@
  */
 function theme_authorize_message($variables) {
-  $message = $variables['message'];
-  $item = array('#markup' => $message);
+  $item = array('#markup' => $variables['message']);
   return drupal_render($item);
 }