Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Tue, 3 Sep 2013 19:22:29 +0000 (12:22 -0700)
committerAllan Zhou <allanzp@gmail.com>
Tue, 3 Sep 2013 19:22:29 +0000 (12:22 -0700)

Trivial merge