Merge branch 'PHP-5.6'

Conflicts:
	ext/gmp/gmp.c

diff --cc ext/gmp/gmp.c
index d76d09561b18687a09830ba040118daa683bbb22,619f1c39c35b8738c28f7f93cedec13e6e2da293..84f6bd4130132f8f1d592ffc3b27a69f8619e31d
--- 1/ext/gmp/gmp.c
--- 2/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@@ -733,18 -770,16 +733,16 @@@ static int convert_to_gmp(mpz_t gmpnumb
        }
        case IS_STRING: {
                char *numstr = Z_STRVAL_P(val);
 -              int skip_lead = 0;
 +              zend_bool skip_lead = 0;
                int ret;
  
-               if (Z_STRLEN_P(val) > 2) {
-                       if (numstr[0] == '0') {
-                               if (numstr[1] == 'x' || numstr[1] == 'X') {
-                                       base = 16;
-                                       skip_lead = 1;
-                               } else if (base != 16 && (numstr[1] == 'b' || numstr[1] == 'B')) {
-                                       base = 2;
-                                       skip_lead = 1;
-                               }
+               if (Z_STRLEN_P(val) > 2 && numstr[0] == '0') {
+                       if ((base == 0 || base == 16) && (numstr[1] == 'x' || numstr[1] == 'X')) {
+                               base = 16;
+                               skip_lead = 1;
+                       } else if ((base == 0 || base == 2) && (numstr[1] == 'b' || numstr[1] == 'B')) {
+                               base = 2;
+                               skip_lead = 1;
                        }
                }