Merge pull request #899 from reactjs/sync-2da4f7fb

Merge pull request #899 from reactjs/sync-2da4f7fb #1131