Merge branch 'release/3.7.0' root/tags/cdm-server/3.7.0 3.7.0
authorjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 12:08:54 +0000 (14:08 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 17 Jul 2015 12:08:54 +0000 (14:08 +0200)

Trivial merge