Merge branch 'release/4.13.0' into develop origin/release/4.14.0
authorjenkins <jenkins-int@bgbm.org>
Wed, 31 Jan 2018 13:41:34 +0000 (14:41 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 31 Jan 2018 13:41:34 +0000 (14:41 +0100)

Trivial merge