Merge branch 'hotfix/5.2.1' 5.2.1
authorjenkins <jenkins-int@bgbm.org>
Thu, 23 Aug 2018 07:37:51 +0000 (09:37 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 23 Aug 2018 07:37:51 +0000 (09:37 +0200)

Trivial merge