Merge branch 'hotfix/3.12.4' root/tags/taxeditor/3.12.4 3.12.4
authorjenkins <jenkins-int@bgbm.org>
Mon, 15 Feb 2016 09:22:52 +0000 (10:22 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 15 Feb 2016 09:22:52 +0000 (10:22 +0100)

Trivial merge