make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path

Conflicts:
	run-tests.php