jenkins merging release branch into master (strategy: theirs)
authorjenkins <jenkins-int@bgbm.org>
Thu, 17 May 2018 09:48:38 +0000 (11:48 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 17 May 2018 09:48:38 +0000 (11:48 +0200)

Trivial merge