Merge branch 'hotfix/4.9.2' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 10 Aug 2017 11:56:23 +0000 (13:56 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 10 Aug 2017 11:56:23 +0000 (13:56 +0200)

Trivial merge