Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Wed, 21 Aug 2013 07:07:03 +0000 (00:07 -0700)
committerAllan Zhou <allanzp@gmail.com>
Wed, 21 Aug 2013 07:07:03 +0000 (00:07 -0700)

Trivial merge