Merge branch 'develop' into feature/cdm-4.7
authorAndreas Müller <a.mueller@bgbm.org>
Sun, 4 Jun 2017 21:46:03 +0000 (23:46 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Sun, 4 Jun 2017 21:46:03 +0000 (23:46 +0200)

Trivial merge