Merge branch 'PHP-7.2'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 14 Feb 2018 18:00:41 +0000 (19:00 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 14 Feb 2018 18:00:41 +0000 (19:00 +0100)

Trivial merge