Merge branch 'hotfix/4.8.2' into develop
authorjenkins <jenkins-int@bgbm.org>
Tue, 11 Jul 2017 09:23:44 +0000 (11:23 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 11 Jul 2017 09:23:44 +0000 (11:23 +0200)

Trivial merge