Merge branch 'release/4.14.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 15 Feb 2018 14:15:58 +0000 (15:15 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 15 Feb 2018 14:15:58 +0000 (15:15 +0100)

Trivial merge