diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 2fdf597533..a033b39713 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -512,6 +512,7 @@ final class _WP_Editors {
 					// Limit the preview styles in the menu/toolbar
 					'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
 
+					'end_container_on_empty_block' => true,
 					'wpeditimage_disable_captions' => $no_captions,
 					'wpeditimage_html5_captions' => current_theme_supports( 'html5', 'caption' ),
 					'plugins' => implode( ',', $plugins ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5102b95f6a..2232685262 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31221';
+$wp_version = '4.2-alpha-31222';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.