Merge branch 'for-15.05' of github.com:HRogge/packages into for-15.05
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 31 May 2016 07:02:05 +0000 (09:02 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 31 May 2016 07:02:05 +0000 (09:02 +0200)

Trivial merge