Merge branch 'hotfix/3.12.2' root/tags/cdmlib/3.12.2 3.12.2
authorjenkins <jenkins-int@bgbm.org>
Mon, 11 Jan 2016 12:50:35 +0000 (13:50 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 11 Jan 2016 12:50:35 +0000 (13:50 +0100)

Trivial merge