Merge pull request #630 from reactjs/sync-a3e9466d-temp

Merge pull request #630 from reactjs/sync-a3e9466d-temp #602