tests still failing, so xfail for now until fixed
tests still failing, so xfail for now until fixed
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  tests still failing, so xfail for now until fixed