Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter
authorMichael Vogel <icarus@dabo.de>
Wed, 24 Jun 2015 19:05:38 +0000 (21:05 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 24 Jun 2015 19:05:38 +0000 (21:05 +0200)

Trivial merge