Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Thu, 22 Aug 2013 17:43:51 +0000 (10:43 -0700)
committerAllan Zhou <allanzp@gmail.com>
Thu, 22 Aug 2013 17:43:51 +0000 (10:43 -0700)

Trivial merge