Merge branch 'hotfix/4.1.1' attic/tags/taxeditor/4.1.1/28234
authorjenkins <jenkins-int@bgbm.org>
Thu, 2 Jun 2016 12:47:12 +0000 (14:47 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 2 Jun 2016 12:47:12 +0000 (14:47 +0200)

Trivial merge