Merge branch 'release/5.1.0'
authorjenkins <jenkins-int@bgbm.org>
Wed, 27 Jun 2018 13:36:40 +0000 (15:36 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 27 Jun 2018 13:36:40 +0000 (15:36 +0200)

Trivial merge