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

Trivial merge