Merge pull request #87 from reactjs/sync-91614a51

Merge pull request #87 from reactjs/sync-91614a51 #240