Merge pull request #88 from reactjs/sync-5138e605

Merge pull request #88 from reactjs/sync-5138e605 #193