Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:29:43 +0000 (17:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:29:43 +0000 (17:29 +0100)

Trivial merge