Merge branch 'hotfix/3.12.3'
authorjenkins <jenkins-int@bgbm.org>
Thu, 14 Jan 2016 10:33:47 +0000 (11:33 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 14 Jan 2016 10:33:47 +0000 (11:33 +0100)

Trivial merge