Implement RFC https://wiki.php.net/rfc/default_encoding
Merge branch 'PHP-5.6'

* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
Merge remote-tracking branch 'origin/master' into str_size_and_int64

Conflicts:
	ext/standard/html.c