Merge branch 'hotfix/4.11.1'
authorjenkins <jenkins-int@bgbm.org>
Tue, 14 Nov 2017 10:42:17 +0000 (11:42 +0100)
committerjenkins <jenkins-int@bgbm.org>
Tue, 14 Nov 2017 10:42:17 +0000 (11:42 +0100)

Trivial merge