Merge pull request #113 from reactjs/sync-f6d762cb

Merge pull request #113 from reactjs/sync-f6d762cb #346