Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 17:12:21 +0000 (19:12 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 17:12:21 +0000 (19:12 +0200)

Trivial merge