Merge pull request #632 from reactjs/sync-f8c81a0f

Merge pull request #632 from reactjs/sync-f8c81a0f #548