Merge remote-tracking branch 'upstream/master'
authorAllan Zhou <allanzp@gmail.com>
Fri, 23 Aug 2013 22:33:36 +0000 (15:33 -0700)
committerAllan Zhou <allanzp@gmail.com>
Fri, 23 Aug 2013 22:33:36 +0000 (15:33 -0700)

Trivial merge