Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Fixed O+ testes
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed O+ testes