Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 18:04:47 +0000 (19:04 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 18:04:47 +0000 (19:04 +0100)

Trivial merge