Added $this and superglobals support for watchpoints
Return SUCCESS and do not confuse use with errors
backported some ext/intl tests from 5.6 into 5.4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
	ext/intl/tests/collator_get_sort_key_variant2.phpt
	ext/intl/tests/locale_get_display_name3.phpt
Add test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backported some ext/intl tests from 5.6 into 5.4
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	ext/mysqli/tests/mysqli_change_user_old.phpt
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  backported some ext/intl tests from 5.6 into 5.4
fix crash in MINFO when no mysqlnd plugins are loaded
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix crash in MINFO when no mysqlnd plugins are loaded
Made refcount info switchable by set refcount on/off. Default: off
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
Fix bug #66171: better handling of symlinks
Fix null byte in LDAP bindings
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks