Merge branch 'hotfix/3.12.2' root/tags/taxeditor/3.12.2 3.12.2
authorjenkins <jenkins-int@bgbm.org>
Tue, 12 Jan 2016 09:10:14 +0000 (10:10 +0100)
committerjenkins <jenkins-int@bgbm.org>
Tue, 12 Jan 2016 09:10:14 +0000 (10:10 +0100)

Trivial merge