Merge branch 'release/3.7.0'
authorjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:11:30 +0000 (11:11 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:11:30 +0000 (11:11 +0200)

Trivial merge