Merge branch 'PHP-5.5' into PHP-5.6

Author: laruence

ext/iconv/tests/iconv_basic_001.phpt

@@ -5,8 +5,10 @@ Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --SKIPIF--
 <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
 <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');} ?>
+<?php if(setlocale(LC_ALL, "en_US.utf8",) === false) { die('skip en_US.utf8 locales not available'); } ?>
 --FILE--
 <?php
+setlocale(LC_ALL, "en_US.utf8");
 $in_charset          = 'UTF-8';
 $out_charset 	     = 'ASCII//TRANSLIT';
 $string_to_translate = 'Žluťoučký kůň\n';