Merge branch 'release/5.5.0' 5.5.0
authorjenkins <jenkins-int@bgbm.org>
Thu, 14 Feb 2019 09:26:37 +0000 (10:26 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 14 Feb 2019 09:26:37 +0000 (10:26 +0100)

Trivial merge