Merge branch 'PHP-7.0' into PHP-7.1
authorFerenc Kovacs <tyra3l@gmail.com>
Tue, 24 Apr 2018 22:14:33 +0000 (00:14 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Tue, 24 Apr 2018 22:14:33 +0000 (00:14 +0200)

Trivial merge