removing the format added by mistake, props to Solar Designer for spotting this.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  removing the format added by mistake, props to Solar Designer for spotting this.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  removing the format added by mistake, props to Solar Designer for spotting this.
Merge branch 'PHP-5.6'

* PHP-5.6:
  removing the format added by mistake, props to Solar Designer for spotting this.
Merge pull request #2 from php/master

Rebase with upstream