Merge branch 'release/4.7.0'
authorjenkins <jenkins-int@bgbm.org>
Tue, 16 May 2017 11:15:12 +0000 (13:15 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 16 May 2017 11:15:12 +0000 (13:15 +0200)

Trivial merge