Merge branch 'release/4.10.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Mon, 25 Sep 2017 13:22:06 +0000 (15:22 +0200)
committerjenkins <jenkins-int@bgbm.org>
Mon, 25 Sep 2017 13:22:06 +0000 (15:22 +0200)

Trivial merge