Merge branch '2016.11-develop' into 2017.11
authorjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 11:06:38 +0000 (13:06 +0200)
committerjenkins <tine20-jenkins@metaways.de>
Mon, 7 Aug 2017 11:06:38 +0000 (13:06 +0200)

Trivial merge