Merge branch 'hotfix/3.8.1' root/tags/taxeditor/3.8.1 3.8.1
authorjenkins <jenkins-int@bgbm.org>
Fri, 2 Oct 2015 14:59:10 +0000 (16:59 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 2 Oct 2015 14:59:10 +0000 (16:59 +0200)

Trivial merge