Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Thu, 10 Aug 2017 15:41:40 +0000 (17:41 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Thu, 10 Aug 2017 15:41:40 +0000 (17:41 +0200)

Trivial merge