Merge branch 'hotfix/4.9.1' 4.9.1
authorjenkins <jenkins-int@bgbm.org>
Fri, 28 Jul 2017 10:43:36 +0000 (12:43 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 28 Jul 2017 10:43:36 +0000 (12:43 +0200)

Trivial merge