Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 30 Sep 2015 08:03:52 +0000 (10:03 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 30 Sep 2015 08:03:52 +0000 (10:03 +0200)

Trivial merge