Merge branch 'php-7.1'
authorStricted <info@stricted.net>
Fri, 23 Dec 2016 19:14:36 +0000 (20:14 +0100)
committerStricted <info@stricted.net>
Fri, 23 Dec 2016 19:14:36 +0000 (20:14 +0100)

Trivial merge