Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Wed, 9 Aug 2017 12:54:20 +0000 (14:54 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Wed, 9 Aug 2017 12:54:20 +0000 (14:54 +0200)

Trivial merge