Merge pull request #642 from reactjs/sync-d52b3ec7

Merge pull request #642 from reactjs/sync-d52b3ec7 #632