Enabled O+ build by default (it may be disabled before 5.0.0 release)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Enabled O+ build by default (it may be disabled before 5.0.0 release)