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

Merge pull request #435 from reactjs/sync-2774ddfa #296