Merge remote-tracking branch 'upstream/master'
authorAndreas Schmitz <aschmitz@posteo.de>
Fri, 7 Feb 2014 11:20:58 +0000 (12:20 +0100)
committerAndreas Schmitz <aschmitz@posteo.de>
Fri, 7 Feb 2014 11:20:58 +0000 (12:20 +0100)

Trivial merge