5.5.10 next
refixed that test for 5.5+
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  refixed that test for 5.5+
  5.5.10 next
Merge branch 'PHP-5.6'

* PHP-5.6:
  refixed that test for 5.5+
  5.5.10 next
Merge remote-tracking branch 'origin/master' into str_size_and_int64