Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 6 Sep 2014 14:59:14 +0000 (16:59 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 6 Sep 2014 14:59:14 +0000 (16:59 +0200)

Trivial merge