Merge branch 'hotfix/3.12.3'
authorjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:25:03 +0000 (11:25 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:25:03 +0000 (11:25 +0100)

Trivial merge