Merge branch 'release/4.0.0' into develop
authorjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:58:15 +0000 (13:58 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 3 May 2016 11:58:15 +0000 (13:58 +0200)

Trivial merge