typo fixes
Merge branch 'opcache' of ../php5.5 into test

* 'opcache' of ../php5.5:
  typo fixes
Merge from GitHub
Merge branch 'opcache' of ../php5.5 into test

* 'opcache' of ../php5.5:
  Merge from GitHub
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)

I can not get a reproduce script since the context is very strict.

Of course I will try to make one, but for now, I just commit this first.
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Merge branch 'opcache' of ../php5.5 into test

* 'opcache' of ../php5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
A minor fix for configure outpu (Tony)
Merge branch 'opcache' of ../php5.5 into test

* 'opcache' of ../php5.5:
  A minor fix for configure outpu (Tony)
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
Merge branch 'opcache' of ../php5.5

* 'opcache' of ../php5.5:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
sync with upstream
Merge branch 'master' of https://github.com/lazy404/ZendOptimizerPlus

Conflicts:
	ZendAccelerator.c
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ZendAccelerator.c
Merge branch 'master' into lz4