Merge remote-tracking branch 'upstream/develop' into 1606-dbm
authorMichael Vogel <icarus@dabo.de>
Mon, 6 Jun 2016 04:21:36 +0000 (06:21 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 6 Jun 2016 04:21:36 +0000 (06:21 +0200)

Trivial merge