Automatic merge from master -> develop
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 6 Jun 2018 06:00:18 +0000 (08:00 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 6 Jun 2018 06:00:18 +0000 (08:00 +0200)
* commit 'd05cc410680b71cb38709ae602467d2c5fc422ec':


Trivial merge