Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
authorMichael Vogel <icarus@dabo.de>
Sun, 24 Jan 2016 17:21:09 +0000 (18:21 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 24 Jan 2016 17:21:09 +0000 (18:21 +0100)

Trivial merge