Merge branch 'release/4.9.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 20 Jul 2017 13:44:55 +0000 (15:44 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 20 Jul 2017 13:44:55 +0000 (15:44 +0200)

Trivial merge