Merge pull request #109 from reactjs/sync-2774ddfa

Merge pull request #109 from reactjs/sync-2774ddfa #329