Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Tue, 20 Aug 2013 00:11:52 +0000 (17:11 -0700)
committerAllan Zhou <allanzp@gmail.com>
Tue, 20 Aug 2013 00:11:52 +0000 (17:11 -0700)

Trivial merge