Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 13 Sep 2015 17:09:31 +0000 (19:09 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 13 Sep 2015 17:09:31 +0000 (19:09 +0200)

Trivial merge