diff --git a/core/includes/common.inc b/core/includes/common.inc
index 46a9356..46f0383 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -29,6 +29,7 @@
 use Drupal\Core\EventSubscriber\HtmlViewSubscriber;
 use Drupal\Core\Routing\GeneratorNotInitializedException;
 use Drupal\Core\Template\Attribute;
+use Drupal\Core\Template\Markup;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Session\AnonymousUserSession;
 
@@ -3778,7 +3779,7 @@ function drupal_render(&$elements, $is_recursive_call = FALSE) {
   }
 
   $elements['#printed'] = TRUE;
-  return $elements['#markup'];
+  return new Markup($elements['#markup']);
 }
 
 /**
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 1c6af1b..bb5386f 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -14,6 +14,7 @@
 use Drupal\Core\Language\Language;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Template\Attribute;
+use Drupal\Core\Template\Markup;
 use Drupal\Core\Utility\Color;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
@@ -1031,7 +1032,7 @@ function template_preprocess_fieldset(&$variables) {
 
   $variables['prefix'] = isset($element['#field_prefix']) ? $element['#field_prefix'] : NULL;
   $variables['suffix'] = isset($element['#field_suffix']) ? $element['#field_suffix'] : NULL;
-  $variables['children'] = $element['#children'];
+  $variables['children'] = new Markup($element['#children']);
 
   // Build legend properties.
   $variables['legend'] = array();
@@ -2689,7 +2690,7 @@ function template_preprocess_form(&$variables) {
     $element['#attributes']['accept-charset'] = "UTF-8";
   }
   $variables['attributes'] = $element['#attributes'];
-  $variables['children'] = $element['#children'];
+  $variables['children'] = new Markup($element['#children']);
 }
 
 /**
@@ -2905,7 +2906,7 @@ function template_preprocess_form_element(&$variables) {
   $variables['label'] = array('#theme' => 'form_element_label');
   $variables['label'] += array_intersect_key($element, array_flip(array('#id', '#required', '#title', '#title_display')));
 
-  $variables['children'] = $element['#children'];
+  $variables['children'] = new Markup($element['#children']);
 }
 
 /**
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index d45c2e5..da18b6a 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -17,6 +17,7 @@
 use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ExtensionNameLengthException;
 use Drupal\Core\Template\Attribute;
+use Drupal\Core\Template\Markup;
 use Drupal\Core\Template\RenderWrapper;
 use Drupal\Core\Theme\ThemeSettings;
 use Drupal\Component\Utility\NestedArray;
@@ -1708,7 +1709,7 @@ function template_preprocess_item_list(&$variables) {
 
     // Set the item's value and attributes for the template.
     $item = array(
-      'value' => $item,
+      'value' => new Markup($item),
       'attributes' => new Attribute($attributes),
     );
   }
@@ -1791,7 +1792,7 @@ function template_preprocess_container(&$variables) {
     $element['#attributes']['class'][] = 'form-wrapper';
   }
 
-  $variables['children'] = $element['#children'];
+  $variables['children'] = new Markup($element['#children']);
   $variables['attributes'] = $element['#attributes'];
 }
 
@@ -2108,7 +2109,7 @@ function template_preprocess_page(&$variables) {
     $variables['secondary_menu'] = theme_get_setting('features.secondary_menu') ? menu_secondary_menu() : array();
     $variables['action_links']   = menu_get_local_actions();
     $variables['tabs']           = menu_local_tabs();
-    $variables['feed_icons']     = drupal_get_feeds();
+    $variables['feed_icons']     = new Markup(drupal_get_feeds());
   }
   else {
     $variables['main_menu']      = array();
@@ -2316,7 +2317,7 @@ function template_preprocess_install_page(&$variables) {
  */
 function template_preprocess_region(&$variables) {
   // Create the $content variable that templates expect.
-  $variables['content'] = $variables['elements']['#children'];
+  $variables['content'] = new Markup($variables['elements']['#children']);
   $variables['region'] = $variables['elements']['#region'];
 
   $variables['attributes']['class'][] = 'region';
diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php
index 1cd43a3..b04f22a 100644
--- a/core/lib/Drupal/Core/CoreServiceProvider.php
+++ b/core/lib/Drupal/Core/CoreServiceProvider.php
@@ -118,7 +118,7 @@ public static function registerTwig(ContainerBuilder $container) {
         'cache' => drupal_installation_attempted() ? FALSE : Settings::get('twig_cache', TRUE),
         // @todo Remove in followup issue
         // @see http://drupal.org/node/1712444.
-        'autoescape' => FALSE,
+        'autoescape' => TRUE,
         'debug' => Settings::get('twig_debug', FALSE),
         'auto_reload' => Settings::get('twig_auto_reload', NULL),
       ))
diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php
index ead5d05..93e4340 100644
--- a/core/lib/Drupal/Core/Template/Attribute.php
+++ b/core/lib/Drupal/Core/Template/Attribute.php
@@ -31,7 +31,7 @@
  *  // Produces <cat class="cat black-cat white-cat black-white-cat" id="socks">
  * @endcode
  */
-class Attribute implements \ArrayAccess, \IteratorAggregate {
+class Attribute extends \Twig_Markup implements \ArrayAccess, \IteratorAggregate {
 
   /**
    * Stores the attribute data.
diff --git a/core/lib/Drupal/Core/Template/Markup.php b/core/lib/Drupal/Core/Template/Markup.php
new file mode 100644
index 0000000..fb53545
--- /dev/null
+++ b/core/lib/Drupal/Core/Template/Markup.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Template\Markup.
+ */
+
+namespace Drupal\Core\Template;
+
+/**
+ * A class that wraps functions to call them while printing in a template.
+ *
+ * To use, one may pass in the function name as a string followed by an array of
+ * arguments to the constructor.
+ * @code
+ * $variables['scripts'] = new Markup('drupal_get_js', array('footer'));
+ * @endcode
+ */
+class Markup extends \Twig_Markup {
+
+  /**
+   * Constructs a Markup object.
+   *
+   * @param string $callback
+   *   The callback function name.
+   * @param array $args
+   *   The arguments to pass to the callback function.
+   */
+  public function __construct($content, $charset = 'UTF-8') {
+    $this->content = $content;
+    $this->charset = $charset;
+  }
+
+  /**
+   * Implements the magic __toString() method.
+   */
+  public function __toString() {
+    return (string) $this->render();
+  }
+
+  /**
+   * Renders the markup.
+   *
+   * @return string
+   *   The results of the callback function.
+   */
+  public function render() {
+    return $this->content;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Template/RenderWrapper.php b/core/lib/Drupal/Core/Template/RenderWrapper.php
index 7d7770d..58888e6 100644
--- a/core/lib/Drupal/Core/Template/RenderWrapper.php
+++ b/core/lib/Drupal/Core/Template/RenderWrapper.php
@@ -16,7 +16,7 @@
  * $variables['scripts'] = new RenderWrapper('drupal_get_js', array('footer'));
  * @endcode
  */
-class RenderWrapper {
+class RenderWrapper extends \Twig_Markup  {
 
   /**
    * Stores the callback function to be called when rendered.
@@ -52,7 +52,7 @@ public function __construct($callback, array $args = array()) {
    * Implements the magic __toString() method.
    */
   public function __toString() {
-    return $this->render();
+    return (string) $this->render();
   }
 
   /**
diff --git a/core/themes/engines/twig/twig.engine b/core/themes/engines/twig/twig.engine
index 1595bf8..e5847cc 100644
--- a/core/themes/engines/twig/twig.engine
+++ b/core/themes/engines/twig/twig.engine
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Extension\Extension;
+use Drupal\Core\Template\Markup;
 
 /**
  * Implements hook_theme().
@@ -138,7 +139,7 @@ function twig_render_var($arg) {
 
   if (is_object($arg)) {
     if (method_exists($arg, '__toString')) {
-      return (string) $arg;
+      return new $arg;
     }
     throw new Exception(t('Object of type "@class" cannot be printed.', array('@class' => get_class($arg))));
   }