Merge branch 'release/5.2.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Fri, 17 Aug 2018 14:14:22 +0000 (16:14 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 17 Aug 2018 14:14:22 +0000 (16:14 +0200)

Trivial merge