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

Trivial merge