Merge branch '2016.11-php7' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Aug 2016 13:35:06 +0000 (15:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Aug 2016 13:35:06 +0000 (15:35 +0200)

Trivial merge