Merge branch 'PHP-5.4' into PHP-5.5

Author: rlerdorf

ext/session/tests/bug60860.phpt

@@ -14,4 +14,4 @@ echo "ok\n";
 --EXPECTF--
 Warning: session_start(): user session functions not defined in %s on line 3
 
-Fatal error: session_start(): Failed to initialize storage module: user (path: ) in %s on line 3
+Fatal error: session_start(): Failed to initialize storage module: user (path: %s) in %s on line 3