this test is fragile on travis, let's see why
double test timeout for travis
Merge branch 'PHP-5.5'

* PHP-5.5:
  double test timeout for travis