Merge branch '2017.11' into 2017.11-develop
authorjenkins <tine20-jenkins@metaways.de>
Tue, 8 Aug 2017 16:52:01 +0000 (18:52 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Tue, 8 Aug 2017 16:52:01 +0000 (18:52 +0200)

Trivial merge