Merge pull request #127 from reactjs/sync-2c7798dc

Merge pull request #127 from reactjs/sync-2c7798dc #196