Merge remote-tracking branch 'upstream/master'
authorsebix <szebi@gmx.at>
Sat, 11 Jan 2014 20:24:55 +0000 (21:24 +0100)
committersebix <szebi@gmx.at>
Sat, 11 Jan 2014 20:24:55 +0000 (21:24 +0100)

Trivial merge