Fixed ZEND_MM_MEM_TYPE=mmap_zero
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero