Merge remote-tracking branch 'origin/develop' into develop
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)

Trivial merge