Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 16:56:19 +0000 (18:56 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Thu, 3 Aug 2017 16:56:19 +0000 (18:56 +0200)

Trivial merge