Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Fri, 11 Aug 2017 09:34:18 +0000 (11:34 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Fri, 11 Aug 2017 09:34:18 +0000 (11:34 +0200)

Trivial merge