Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
Fixed typo
Merge branch 'pull-request/622' into PHP-5.6

* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding