Merge branch 'PHP-7.0'
authorDerick Rethans <github@derickrethans.nl>
Tue, 22 Sep 2015 08:08:55 +0000 (09:08 +0100)
committerDerick Rethans <github@derickrethans.nl>
Tue, 22 Sep 2015 08:08:55 +0000 (09:08 +0100)

Trivial merge