Fix version check in test
Merge branch 'PHP-5.5'