Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
Make all code paths in json_determine_array_type() return constants.

This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.
Fix broken test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix broken test
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix broken test

Conflicts:
	NEWS
missing 'config.h' in 5dc37b3
Merge branch 'PHP-5.6'

* PHP-5.6:
  missing 'config.h' in 5dc37b3
Merge branch 'master' into str_size_and_int64