Merge branch 'release/4.1.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Tue, 31 May 2016 14:50:47 +0000 (16:50 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 31 May 2016 14:50:47 +0000 (16:50 +0200)

Trivial merge