Merge pull request #83 from reactjs/sync-fc296034

Merge pull request #83 from reactjs/sync-fc296034 #200