Merge pull request #672 from reactjs/sync-abe931a8

Merge pull request #672 from reactjs/sync-abe931a8 #628