Merge branch 'PHP-7.1'
authorDerick Rethans <github@derickrethans.nl>
Thu, 25 May 2017 14:57:15 +0000 (10:57 -0400)
committerDerick Rethans <github@derickrethans.nl>
Thu, 25 May 2017 14:57:15 +0000 (10:57 -0400)

Trivial merge