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

Trivial merge