Merge branch 'hotfix/3.7.1' root/tags/taxeditor/3.7.1 3.7.1
authorjenkins <jenkins-int@bgbm.org>
Tue, 18 Aug 2015 14:17:49 +0000 (16:17 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 18 Aug 2015 14:17:49 +0000 (16:17 +0200)

Trivial merge