Merge remote-tracking branch 'origin/cdm-4.7' into feature/cdm-4.7
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 4 May 2017 06:30:48 +0000 (08:30 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 4 May 2017 06:30:48 +0000 (08:30 +0200)

Trivial merge