diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 65a62d7..41c6eb0 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -304,8 +304,8 @@ function drupal_get_path($type, $name) {
  *   - 'context' (defaults to the empty context): The context the source string
  *     belongs to.
  *
- * @return \Drupal\Core\StringTranslation\TranslatableMarkup
- *   An object that, when cast to a string, will yield the translated string.
+ * @return
+ *   The translated string.
  *
  * @see \Drupal\Component\Utility\SafeMarkup::format()
  * @ingroup sanitization
diff --git a/core/includes/install.inc b/core/includes/install.inc
index c9fd75d..162d9c9 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -210,6 +210,7 @@ function drupal_get_database_types() {
  *   @endcode
  *   gets dumped as:
  *   @code
+ *   $config_directories['active'] = 'config_hash/active';
  *   $config_directories['sync'] = 'config_hash/sync'
  *   @endcode
  */
@@ -523,7 +524,8 @@ function drupal_install_config_directories() {
  * Ensures that the config directory exists and is writable, or can be made so.
  *
  * @param string $type
- *   Type of config directory to return. Drupal core provides 'sync'.
+ *   Type of config directory to return. Drupal core provides 'active' and
+ *   'sync'.
  *
  * @return bool
  *   TRUE if the config directory exists and is writable.
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index c59ed8f..12184df 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -1453,11 +1453,9 @@ protected function wrapSchemaException(callable $callback) {
       $callback();
     }
     catch (SchemaException $e) {
-      $message .= ' ' . $e->getMessage();
       throw new EntityStorageException($message, 0, $e);
     }
     catch (DatabaseExceptionWrapper $e) {
-      $message .= ' ' . $e->getMessage();
       throw new EntityStorageException($message, 0, $e);
     }
   }
diff --git a/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php b/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
index 1944ecb..57ed36e 100644
--- a/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
+++ b/core/lib/Drupal/Core/StringTranslation/TranslationInterface.php
@@ -34,7 +34,7 @@
    *   - 'context': The context the source string belongs to.
    *
    * @return \Drupal\Core\StringTranslation\TranslatableMarkup
-   *   An object that, when cast to a string, will yield the translated string.
+   *   The translated string.
    *
    * @see \Drupal\Component\Utility\SafeMarkup::format()
    */
diff --git a/core/modules/system/src/Tests/System/UncaughtExceptionTest.php b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
index 3460125..fe8cdf8 100644
--- a/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
+++ b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
@@ -137,6 +137,7 @@ public function testMissingDependencyCustomErrorHandler() {
     $settings_php .= "  print('Oh oh, flying teapots');\n";
     $settings_php .= "  exit();\n";
     $settings_php .= "});\n";
+    $settings_php .= "\$settings['teapots'] = TRUE;\n";
     file_put_contents($settings_filename, $settings_php);
 
     $this->drupalGet('broken-service-class');
@@ -254,7 +255,7 @@ public function testLoggerException() {
     $this->assertIdentical(count($errors), 1, 'Exactly one line logged to the PHP error log');
 
     $expected_path = \Drupal::root() . '/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php';
-    $expected_line = 61;
+    $expected_line = 63;
     $expected_entry = "Failed to log error: Exception: Deforestation in Drupal\\error_service_test\\MonkeysInTheControlRoom->handle() (line ${expected_line} of ${expected_path})";
     $this->assert(strpos($errors[0], $expected_entry) !== FALSE, 'Original error logged to the PHP error log when an exception is thrown by a logger');
 
diff --git a/core/modules/system/tests/modules/error_service_test/error_service_test.services.yml b/core/modules/system/tests/modules/error_service_test/error_service_test.services.yml
index ef874e5..c2a5633 100644
--- a/core/modules/system/tests/modules/error_service_test/error_service_test.services.yml
+++ b/core/modules/system/tests/modules/error_service_test/error_service_test.services.yml
@@ -1,6 +1,7 @@
 services:
   http_middleware.monkeys:
     class: Drupal\error_service_test\MonkeysInTheControlRoom
+    arguments: ['@settings']
     tags:
       - { name: http_middleware, priority: 400 }
   # Set up a service with a missing class dependency.
diff --git a/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php b/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
index f780d29..f31af5a 100644
--- a/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
+++ b/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
@@ -6,6 +6,7 @@
 
 namespace Drupal\error_service_test;
 
+use Drupal\Core\Site\Settings;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
@@ -29,8 +30,9 @@ class MonkeysInTheControlRoom implements HttpKernelInterface {
    * @param \Symfony\Component\HttpKernel\HttpKernelInterface $app
    *   The wrapper HTTP kernel.
    */
-  public function __construct(HttpKernelInterface $app) {
+  public function __construct(HttpKernelInterface $app, Settings $settings) {
     $this->app = $app;
+    $this->settings = $settings;
   }
 
   /**
@@ -61,7 +63,20 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
       throw new \Exception('Deforestation');
     }
 
-    return $this->app->handle($request, $type, $catch);
+    if ($this->settings->get('teapots', FALSE) && class_exists('\TypeError')) {
+      try {
+        $return = $this->app->handle($request, $type, $catch);
+      }
+      catch (\TypeError $e) {
+        header('HTTP/1.1 418 I\'m a teapot');
+        print('Oh oh, flying teapots');
+        exit;
+      }
+    }
+    else {
+      $return = $this->app->handle($request, $type, $catch);
+    }
+    return $return;
   }
 
 }
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 1a6d148..b1f95e2 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -223,24 +223,22 @@
  * Location of the site configuration files.
  *
  * The $config_directories array specifies the location of file system
- * directories used for configuration data. On install, the "sync" directory is
- * created. This is used for configuration imports. The "active" directory is
- * not created by default since the default storage for active configuration is
- * the database rather than the file system. (This can be changed. See "Active
- * configuration settings" below).
- *
- * The default location for the "sync" directory is inside a randomly-named
- * directory in the public files path. The setting below allows you to override
- * the "sync" location.
- *
- * If you use files for the "active" configuration, you can tell the
- * Configuration system where this directory is located by adding an entry with
- * array key CONFIG_ACTIVE_DIRECTORY.
+ * directories used for configuration data. On install, "active" and "sync"
+ * directories are created for configuration. The sync directory is used for
+ * configuration imports; the active directory is not used by default, since the
+ * default storage for active configuration is the database rather than the file
+ * system (this can be changed; see "Active configuration settings" below).
+ *
+ * The default location for the active and sync directories is inside a
+ * randomly-named directory in the public files path; this setting allows you to
+ * override these locations. If you use files for the active configuration, you
+ * can enhance security by putting the active configuration outside your
+ * document root.
  *
  * Example:
  * @code
  *   $config_directories = array(
- *     CONFIG_SYNC_DIRECTORY => '/directory/outside/webroot',
+ *     CONFIG_SYNC_DIRECTORY => '/another/directory/outside/webroot',
  *   );
  * @endcode
  */
@@ -582,10 +580,6 @@
  * By default, the active configuration is stored in the database in the
  * {config} table. To use a different storage mechanism for the active
  * configuration, do the following prior to installing:
- * - Create an "active" directory and declare its path in $config_directories
- *   as explained under the 'Location of the site configuration files' section
- *   above in this file. To enhance security, you can declare a path that is
- *   outside your document root.
  * - Override the 'bootstrap_config_storage' setting here. It must be set to a
  *   callable that returns an object that implements
  *   \Drupal\Core\Config\StorageInterface.