Merge pull request #166 from reactjs/sync-e9a7cb1b

Merge pull request #166 from reactjs/sync-e9a7cb1b #334