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

Merge pull request #637 from reactjs/sync-50d6991c #620