Merge pull request #77 from reactjs/sync-9000e6e0

Merge pull request #77 from reactjs/sync-9000e6e0 #220