Merge branch 'release/4.2.0' root/tags/cdmlib/4.2.0 root/trunk/cdmlib 4.2.0
authorjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 14:10:45 +0000 (16:10 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 14:10:45 +0000 (16:10 +0200)

Trivial merge