Merge remote-tracking branch 'upstream/master' into 1601-gcontact
authorMichael Vogel <icarus@dabo.de>
Fri, 8 Jan 2016 12:20:04 +0000 (13:20 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 8 Jan 2016 12:20:04 +0000 (13:20 +0100)

Trivial merge