Merge branch '2016.11-develop' into 2017.11
authorjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 14:34:40 +0000 (16:34 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 14:34:40 +0000 (16:34 +0200)

Trivial merge