Merge branch 'master' into develop
authorjenkins <jenkins-int@bgbm.org>
Thu, 10 Sep 2015 15:55:52 +0000 (17:55 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 10 Sep 2015 15:55:52 +0000 (17:55 +0200)

Trivial merge