Merge branch 'release/4.7.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Tue, 16 May 2017 15:19:21 +0000 (17:19 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 16 May 2017 15:19:21 +0000 (17:19 +0200)

Trivial merge