diff --git a/CHANGELOG b/CHANGELOG
index 908bc30050..977cfb9c9e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 2.11.0 (2019-XX-XX)
 
+ * added the possibility to register classes/interfaces as being safe for the escaper ("EscaperExtension::addSafeClass()")
  * deprecated CoreExtension::setEscaper() and CoreExtension::getEscapers() in favor of the same methods on EscaperExtension
  * macros are now auto-imported in the template they are defined (under the ``_self`` variable)
  * added support for macros on "is defined" tests
diff --git a/doc/api.rst b/doc/api.rst
index 0f0abcee95..5c0294c20b 100644
--- a/doc/api.rst
+++ b/doc/api.rst
@@ -415,6 +415,24 @@ The escaping rules are implemented as follows:
         {% set text = "Twig<br />" %}
         {{ foo ? text|escape : "<br />Twig" }} {# the result of the expression won't be escaped #}
 
+* Objects with a ``__toString`` method are converted to strings and
+  escaped. You can mark some classes and/or interfaces as being safe for some
+  strategies via ``EscaperExtension::addSafeClass()``:
+
+  .. code-block:: twig
+
+        // mark object of class Foo as safe for the HTML strategy
+        $escaper->addSafeClass('Foo', ['html']);
+
+        // mark object of interface Foo as safe for the HTML strategy
+        $escaper->addSafeClass('FooInterface', ['html']);
+
+        // mark object of class Foo as safe for the HTML and JS strategies
+        $escaper->addSafeClass('Foo', ['html', 'js']);
+
+        // mark object of class Foo as safe for all strategies
+        $escaper->addSafeClass('Foo', ['all']);
+
 * Escaping is applied before printing, after any other filter is applied:
 
   .. code-block:: twig
diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php
index 497cfde20f..77add9eff5 100644
--- a/src/Extension/EscaperExtension.php
+++ b/src/Extension/EscaperExtension.php
@@ -19,6 +19,8 @@ final class EscaperExtension extends AbstractExtension
 {
     private $defaultStrategy;
     private $escapers = [];
+    private $safeClasses = [];
+    private static $safeClassesFrozen = false;
 
     /**
      * @param string|false|callable $defaultStrategy An escaping strategy
@@ -104,6 +106,39 @@ public function getEscapers()
     {
         return $this->escapers;
     }
+
+
+    /**
+     * @internal
+     */
+    public function getSafeClasses(): array
+    {
+        self::$safeClassesFrozen = true;
+        return $this->safeClasses;
+    }
+
+    public function setSafeClasses(array $safeClasses = []): void
+    {
+        if (self::$safeClassesFrozen) {
+            throw new \LogicException('Unable to set the safe classes for escaping as twig_escape_filter() has already been initialized.');
+        }
+
+        foreach ($safeClasses as $class => $strategies) {
+            $this->addSafeClass($class, $strategies);
+        }
+    }
+
+    public function addSafeClass(string $class, array $strategies): void
+    {
+        if (self::$safeClassesFrozen) {
+            throw new \LogicException('Unable to set the safe classes for escaping as twig_escape_filter() has already been initialized.');
+        }
+        $class = ltrim($class, '\\');
+        if (!isset($this->safeClasses[$class])) {
+            $this->safeClasses[$class] = [];
+        }
+        $this->safeClasses[$class] = array_merge($this->safeClasses[$class], $strategies);
+    }
 }
 
 class_alias('Twig\Extension\EscaperExtension', 'Twig_Extension_Escaper');
@@ -148,6 +183,35 @@ function twig_escape_filter(Environment $env, $string, $strategy = 'html', $char
 
     if (!\is_string($string)) {
         if (\is_object($string) && method_exists($string, '__toString')) {
+            if ($autoescape) {
+                static $safeLookup;
+                static $safeClasses;
+                if (null === $safeLookup) {
+                    $safeLookup = [];
+                    $safeClasses = $env->getExtension('Twig\Extension\EscaperExtension')->getSafeClasses();
+                    foreach ($safeClasses as $class => $strategies) {
+                        foreach ($strategies as $s) {
+                            $safeLookup[$s][$class] = true;
+                        }
+                    }
+                }
+                $c = get_class($string);
+                if (!isset($safeClasses[$c])) {
+                    $safeClasses[$c] = [];
+                    foreach (class_parents($string) + class_implements($string) as $class) {
+                        if (isset($safeClasses[$class])) {
+                            $safeClasses[$c] = array_unique(array_merge($safeClasses[$c], $safeClasses[$class]));
+                            foreach ($safeClasses[$class] as $s) {
+                                $safeLookup[$s][$c] = true;
+                            }
+                        }
+                    }
+                }
+                if (isset($safeLookup[$strategy][$c]) || isset($safeLookup['all'][$c])) {
+                    return (string) $string;
+                }
+            }
+
             $string = (string) $string;
         } elseif (\in_array($strategy, ['html', 'js', 'css', 'html_attr', 'url'])) {
             return $string;
diff --git a/test/Twig/Tests/Extension/EscaperTest.php b/test/Twig/Tests/Extension/EscaperTest.php
index 91e5ba0111..1ffdade3d6 100644
--- a/test/Twig/Tests/Extension/EscaperTest.php
+++ b/test/Twig/Tests/Extension/EscaperTest.php
@@ -42,9 +42,43 @@ public function testUnknownCustomEscaper()
     {
         twig_escape_filter(new Environment($this->getMockBuilder(LoaderInterface::class)->getMock()), 'foo', 'bar');
     }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     * @dataProvider provideObjectsForEscaping
+     */
+    public function testObjectEscaping(string $escapedHtml, string $escapedJs, array $safeClasses)
+    {
+        $obj = new Twig_Tests_Extension_TestClass();
+        $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());
+        $twig->getExtension('\Twig\Extension\EscaperExtension')->setSafeClasses($safeClasses);
+        $this->assertSame($escapedHtml, twig_escape_filter($twig, $obj, 'html', null, true));
+        $this->assertSame($escapedJs, twig_escape_filter($twig, $obj, 'js', null, true));
+    }
+    public function provideObjectsForEscaping()
+    {
+        return [
+            ['&lt;br /&gt;', '<br />', ['\Twig_Tests_Extension_TestClass' => ['js']]],
+            ['<br />', '\u003Cbr\u0020\/\u003E', ['\Twig_Tests_Extension_TestClass' => ['html']]],
+            ['&lt;br /&gt;', '<br />', ['\Twig_Tests_Extension_SafeHtmlInterface' => ['js']]],
+            ['<br />', '<br />', ['\Twig_Tests_Extension_SafeHtmlInterface' => ['all']]],
+        ];
+    }
 }
 
 function foo_escaper_for_test(Environment $env, $string, $charset)
 {
     return $string.$charset;
 }
+
+interface Twig_Tests_Extension_SafeHtmlInterface
+{
+}
+class Twig_Tests_Extension_TestClass implements Twig_Tests_Extension_SafeHtmlInterface
+{
+    public function __toString()
+    {
+        return '<br />';
+    }
+}