Merge branch 'release/4.11.0' into develop origin/release/4.12.0
authorjenkins <jenkins-int@bgbm.org>
Wed, 8 Nov 2017 11:21:43 +0000 (12:21 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 8 Nov 2017 11:21:43 +0000 (12:21 +0100)

Trivial merge