diff --git a/upload/config.php b/upload/config.php
index e3f8edd76..84efd6f3d 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R419';
-$bb_cfg['tp_release_date'] = '21-05-2012';
+$bb_cfg['tp_release_state'] = 'R420';
+$bb_cfg['tp_release_date'] = '23-05-2012';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 42156ee26..ebe53814c 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2517,6 +2517,7 @@ function caching_output ($enabled, $mode, $cache_var_name, $ttl = 300)
  */
 function bb_json_encode ($data)
 {
+	$data = mb_check_encoding($data, 'UTF-8') ? $data : utf8_encode($data);
 	return json_encode($data);
 }