Merge branch 'hotfix/3.12.3' root/tags/taxeditor/3.12.3 3.12.3
authorjenkins <jenkins-int@bgbm.org>
Wed, 10 Feb 2016 15:11:46 +0000 (16:11 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 10 Feb 2016 15:11:46 +0000 (16:11 +0100)

Trivial merge