Merge remote-tracking branch 'upstream/master' into 1601-gcontact
authorMichael Vogel <icarus@dabo.de>
Sat, 9 Jan 2016 07:17:28 +0000 (08:17 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 9 Jan 2016 07:17:28 +0000 (08:17 +0100)

Trivial merge