Merge branch 'release/5.7.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 6 May 2019 14:48:22 +0000 (16:48 +0200)
committerjenkins <jenkins-int@bgbm.org>
Mon, 6 May 2019 14:48:22 +0000 (16:48 +0200)

Trivial merge