Merge branch 'pull-request/2115' into PHP-7.1

diff --cc UPGRADING
index 05e18c31bd578e8cc227b8182d9be098a31d5b23,05e18c31bd578e8cc227b8182d9be098a31d5b23..9cef0095d1386d37ace815767c65443facc7fb94
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
@@@ -76,6 -76,6 +76,8 @@@ PHP 7.1 UPGRADE NOTE
    . Calling a function with less arguments than mandatory declared ones in
      signature now issues a Fatal Error (Error Exception) instead of a Warning.
      (RFC https://wiki.php.net/rfc/too_few_args).
++  . The error message for E_RECOVERABLE errors has been changed from "Catchable
++    fatal error" to "Recoverable fatal error".
  
  - JSON:
    . The serialize_precision is used instead of precision when encoding double