Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Thu, 1 Feb 2018 14:30:58 +0000 (15:30 +0100)
committerAnatol Belski <ab@php.net>
Thu, 1 Feb 2018 14:30:58 +0000 (15:30 +0100)
* PHP-7.2:
  Ensure there are no line breaks in the error msg


Trivial merge