Merge branch 'hotfix/5.1.1' 5.1.1
authorjenkins <jenkins-int@bgbm.org>
Mon, 2 Jul 2018 10:27:29 +0000 (12:27 +0200)
committerjenkins <jenkins-int@bgbm.org>
Mon, 2 Jul 2018 10:27:29 +0000 (12:27 +0200)

Trivial merge