Merge remote-tracking branch 'upstream/master'
authorTony <exocoder@gmail.com>
Sun, 6 Apr 2014 10:49:23 +0000 (11:49 +0100)
committerTony <exocoder@gmail.com>
Sun, 6 Apr 2014 10:49:23 +0000 (11:49 +0100)

Trivial merge