Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Made bug44295-win.phpt locale independent

Author: cmb69

ext/standard/tests/general_functions/bug44295-win.phpt

@@ -23,7 +23,7 @@ try {
 ?>
 ==DONE==
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 before
-in catch: DirectoryIterator::__construct(c:\not\exists\here,c:\not\exists\here): The system cannot find the path specified. (code: 3)
+in catch: DirectoryIterator::__construct(c:\not\exists\here,c:\not\exists\here): %s (code: 3)
 ==DONE==