Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Tue, 15 Sep 2015 17:06:11 +0000 (19:06 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 15 Sep 2015 17:06:11 +0000 (19:06 +0200)

Trivial merge