Merge remote-tracking branch 'upstream/master'
authorTony <exocoder@gmail.com>
Thu, 27 Mar 2014 19:32:05 +0000 (19:32 +0000)
committerTony <exocoder@gmail.com>
Thu, 27 Mar 2014 19:32:05 +0000 (19:32 +0000)

Trivial merge