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

Merge pull request #357 from reactjs/sync-2774ddfa #351