Merge branch 'release/5.0.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 17 May 2018 13:46:50 +0000 (15:46 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 17 May 2018 13:46:50 +0000 (15:46 +0200)

Trivial merge