Merge remote-tracking branch 'upstream/develop' into 1606-dbm
authorMichael Vogel <icarus@dabo.de>
Wed, 1 Jun 2016 08:55:13 +0000 (10:55 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 1 Jun 2016 08:55:13 +0000 (10:55 +0200)

Trivial merge