Merge pull request #840 from reactjs/sync-50d6991c

Merge pull request #840 from reactjs/sync-50d6991c #998