Merge branch 'release/3.8.0' root/tags/cdmlib/3.8.0 3.8.0
authorjenkins <jenkins-int@bgbm.org>
Thu, 10 Sep 2015 15:55:45 +0000 (17:55 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 10 Sep 2015 15:55:45 +0000 (17:55 +0200)

Trivial merge