Merge branch 'PHP-5.5'
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)

Conflicts:
	NEWS
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed compatibility with php-5.2
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)

Conflicts:
	NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)

Conflicts:
	NEWS