Merge branch 'master' into mpr_rework
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 14 Feb 2017 14:13:33 +0000 (15:13 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 14 Feb 2017 14:13:33 +0000 (15:13 +0100)

Trivial merge