Merge branch 'hotfix/5.4.1' 5.4.1
authorjenkins <jenkins-int@bgbm.org>
Fri, 2 Nov 2018 10:54:30 +0000 (11:54 +0100)
committerjenkins <jenkins-int@bgbm.org>
Fri, 2 Nov 2018 10:54:30 +0000 (11:54 +0100)

Trivial merge