Merge branch 'hotfix/4.11.2' 4.11.2
authorjenkins <jenkins-int@bgbm.org>
Wed, 22 Nov 2017 13:00:58 +0000 (14:00 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 22 Nov 2017 13:00:58 +0000 (14:00 +0100)

Trivial merge