Fix build problem in C++11
Fixed bug #64106: Segfault on SplFixedArray[][x] = y when extended
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5'

Conflicts:
	configure.in
	main/php_version.h