Merge branch 'master' into mpr_rework
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 16 Feb 2017 07:54:09 +0000 (08:54 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 16 Feb 2017 07:54:09 +0000 (08:54 +0100)

Trivial merge