Merge branch '1.1' into 1.2

* 1.1:
  Bump to v1.1.31

Conflicts:
	CHANGELOG.md
	src/Patchwork/Utf8/Bootup.php

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.2.6 (2015-12-15)
+
+- fix compat with symfony-polyfill
+
 ## v1.2.5 (2015-10-14)
 
 - handle the third argument of mb_convert_encoding() being an array
@@ -41,6 +45,14 @@
 - add best-fit mappings for UTF-8 to Code Page approximations
 - add portable Unicode filesystem access under Windows and other OSes
 
+## v1.1.31 (2015-12-15)
+
+- fix compat with symfony-polyfill
+
+## v1.1.30 (2015-06-29)
+
+- fix mb_strrpos shim with negative offset
+
 ## v1.1.29 (2015-04-26)
 
 - fix ucwords to be functionally the same as in-built PHP version

src/Patchwork/Utf8/Bootup.php

@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2013 Nicolas Grekas - [email protected]
+ * Copyright (C) 2016 Nicolas Grekas - [email protected]
  *
  * This library is free software; you can redistribute it and/or modify it
  * under the terms of the (at your option):
@@ -66,7 +66,7 @@ public static function initMbstring()
             if (!in_array(strtolower(mb_language()), array('uni', 'neutral'))) {
                 mb_language('uni');
             }
-        } elseif (!defined('MB_OVERLOAD_MAIL')) {
+        } elseif (!function_exists('mb_strlen')) {
             extension_loaded('iconv') or static::initIconv();
 
             require __DIR__.'/Bootup/mbstring.php';
@@ -87,7 +87,7 @@ public static function initIconv()
             if ('UTF-8' !== strtoupper(iconv_get_encoding('output_encoding'))) {
                 iconv_set_encoding('output_encoding', 'UTF-8');
             }
-        } elseif (!defined('ICONV_IMPL')) {
+        } elseif (!function_exists('iconv')) {
             require __DIR__.'/Bootup/iconv.php';
         }
     }
@@ -113,7 +113,7 @@ public static function initIntl()
 
         define('GRAPHEME_CLUSTER_RX', PCRE_VERSION >= '8.32' ? '\X' : s\Intl::GRAPHEME_CLUSTER_RX);
 
-        if (!extension_loaded('intl')) {
+        if (!function_exists('grapheme_strlen')) {
             extension_loaded('iconv') or static::initIconv();
             extension_loaded('mbstring') or static::initMbstring();