diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index bc3ae35c2e..bebc63876d 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -4041,6 +4041,7 @@ function print_emoji_styles() {
 <style type="text/css">
 img.wp-smiley,
 img.emoji {
+	display: inline !important;
 	border: none !important;
 	box-shadow: none !important;
 	height: 1em !important;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7423659464..8d3a50ec79 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta1-31770';
+$wp_version = '4.2-beta1-31771';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.