Merge pull request #657 from reactjs/sync-f9e2c139

Merge pull request #657 from reactjs/sync-f9e2c139 #681