Merge branch '2015.11-php7' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Apr 2016 15:25:24 +0000 (17:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Apr 2016 15:25:24 +0000 (17:25 +0200)

Trivial merge