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

Trivial merge