Automatic merge from master -> develop
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 5 Jun 2018 08:01:22 +0000 (10:01 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 5 Jun 2018 08:01:22 +0000 (10:01 +0200)
* commit 'd592fbf75110b8aa635dca6daa92d46fe37c3478':


Trivial merge