Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Oct 2016 13:50:55 +0000 (15:50 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Oct 2016 13:50:55 +0000 (15:50 +0200)

Trivial merge