Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 12 Sep 2017 07:03:07 +0000 (09:03 +0200)
committerAnatol Belski <ab@php.net>
Tue, 12 Sep 2017 07:03:07 +0000 (09:03 +0200)
* PHP-7.0:
  Move dev to 7.0.25


Trivial merge