Merge branch 'PHP-5.6'

* PHP-5.6:
  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

diff --cc run-tests.php
Simple merge