diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 2ae86d88f5..5f5464e03f 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -130,7 +130,7 @@ add_filter( 'the_title', 'convert_chars' );
 add_filter( 'the_title', 'trim'          );
 
 add_filter( 'the_content', 'wptexturize'                       );
-add_filter( 'the_content', 'convert_smilies'                   );
+add_filter( 'the_content', 'convert_smilies',               20 );
 add_filter( 'the_content', 'wpautop'                           );
 add_filter( 'the_content', 'shortcode_unautop'                 );
 add_filter( 'the_content', 'prepend_attachment'                );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c86e90d34e..fb2ae83bba 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37297';
+$wp_version = '4.6-alpha-37298';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.