Merge remote-tracking branch 'upstream/master'
authorAndreas van Cranenburgh <andreas@unstable.nl>
Sun, 3 Nov 2013 13:34:09 +0000 (14:34 +0100)
committerAndreas van Cranenburgh <andreas@unstable.nl>
Sun, 3 Nov 2013 13:34:09 +0000 (14:34 +0100)

Trivial merge