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

Merge pull request #168 from reactjs/sync-2774ddfa #338