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

Trivial merge