Merge branch '2015.11-php7' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 08:35:31 +0000 (10:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 08:35:31 +0000 (10:35 +0200)

Trivial merge